Man, got the app running for the most part but I'm thinking of renaming this branch RAT_KING

just3ws · just3ws · commit f1ba7789f1e8 · 2014-09-18T23:45:00.000-05:00
diff --git a/Gemfile b/Gemfile
@@ -162,8 +162,8 @@ group :development, :test do
   gem 'jazz_hands', github: 'nixme/jazz_hands', branch: 'bring-your-own-debugger'
   gem 'launchy'
   gem 'pry-byebug'
-  gem 'pry-rescue'
-  gem 'pry-stack_explorer'
+  #gem 'pry-rescue'
+  #gem 'pry-stack_explorer'
   gem 'quiet_assets'
   gem 'rspec-rails'
   gem 'syntax'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -341,7 +341,6 @@ GEM
     httpauth (0.2.1)
     i18n (0.6.11)
     inflecto (0.0.2)
-    interception (0.5)
     ipaddress (0.8.0)
     jbuilder (2.1.3)
       activesupport (>= 3.0.0, < 5)
@@ -489,9 +488,6 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-rescue (1.4.1)
-      interception (>= 0.5)
-      pry
     pry-stack_explorer (0.4.9.1)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
@@ -809,8 +805,6 @@ DEPENDENCIES
   pg
   postgres_ext
   pry-byebug
-  pry-rescue
-  pry-stack_explorer
   pubnub (= 0.1.9)
   puma
   querystring
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
@@ -39,20 +39,26 @@ def followed
   end
 
   def show
+
     show_params = params.permit(:job_id, :refresh, :callback, :id, :slug)
 
     respond_to do |format|
       format.html do
         @team = team_from_params(slug: show_params[:slug], id: show_params[:id])
+
         return render_404 if @team.nil?
+
         @team_protips = @team.trending_protips(4)
         @query = "team:#{@team.slug}"
         viewing_user.track_team_view!(@team) if viewing_user
         @team.viewed_by(viewing_user || session_id) unless is_admin?
         @job = show_params[:job_id].nil? ? @team.jobs.sample : Opportunity.with_public_id(show_params[:job_id])
+
         @other_jobs = @team.jobs.reject { |job| job.id == @job.id } unless @job.nil?
+
         return render(:premium) if show_premium_page?
       end
+
       format.json do
         options = { :expires_in => 5.minutes }
         options[:force] = true if !show_params[:refresh].blank?
@@ -92,7 +98,7 @@ def create
   end
 
   #def team_to_regex(team)
-    #team.name.gsub(/ \-\./, '.*')
+  #team.name.gsub(/ \-\./, '.*')
   #end
 
   def edit
@@ -259,11 +265,12 @@ def deny_join
 
   protected
 
-
   def team_from_params(opts)
-    return Team.where(slug: opts[:slug].downcase).first if opts[:slug].present?
-
-    Team.find(opts[:id])
+    if opts[:slug].present?
+      Team.where(slug: opts[:slug].downcase).first
+    else
+      Team.find(opts[:id])
+    end
   end
 
   def replace_section(section_name)
diff --git a/app/models/opportunity.rb b/app/models/opportunity.rb
@@ -35,15 +35,9 @@ class Opportunity < ActiveRecord::Base
   #remove default scope
   default_scope valid
 
-  attr_accessor :title
-
   HUMANIZED_ATTRIBUTES = { name: 'Title' }
 
-  #def team
-    #@team ||= Team.find(team_document_id.to_s)
-  #end
-
-  belongs_to :team
+  belongs_to :team, class_name: 'Team', touch: true
 
   def self.human_attribute_name(attr,options={})
     HUMANIZED_ATTRIBUTES[attr.to_sym] || super
@@ -57,29 +51,27 @@ def self.parse_salary(salary_string)
       0
     else
       salary = number.to_i
-      if thousands.downcase == 'k' or salary < 1000
+      if thousands.downcase == 'k' || salary < 1000
         salary * 1000
       else
         salary
       end
     end
+  end
 
+  def self.based_on(tags)
+    query_string = "tags:#{tags.join(' OR ')}"
+    failover_scope = Opportunity.joins('inner join taggings on taggings.taggable_id = opportunities.id').joins('inner join tags on taggings.tag_id = tags.id').where("taggings.taggable_type = 'Opportunity' AND taggings.context = 'tags'").where('lower(tags.name) in (?)', tags.map(&:downcase)).group('opportunities.id').order('count(opportunities.id) desc')
+    Opportunity::Search.new(Opportunity, Opportunity::Search::Query.new(query_string), nil, nil, nil, failover: failover_scope).execute
+  end
 
+  def self.with_public_id(public_id)
+    where(public_id: public_id).first
+  end
 
-    def based_on(tags)
-      query_string = "tags:#{tags.join(' OR ')}"
-      failover_scope = Opportunity.joins('inner join taggings on taggings.taggable_id = opportunities.id').joins('inner join tags on taggings.tag_id = tags.id').where("taggings.taggable_type = 'Opportunity' AND taggings.context = 'tags'").where('lower(tags.name) in (?)', tags.map(&:downcase)).group('opportunities.id').order('count(opportunities.id) desc')
-      Opportunity::Search.new(Opportunity, Opportunity::Search::Query.new(query_string), nil, nil, nil, failover: failover_scope).execute
-    end
-
-    def with_public_id(public_id)
-      where(public_id: public_id).first
-    end
-
-    def random
-      uncached do
-        order('RANDOM()')
-      end
+  def self.random
+    uncached do
+      order('RANDOM()')
     end
   end
 
@@ -123,22 +115,22 @@ def destroy(force = false)
     if force
       super
     else
-      self.deleted = true
-      self.deleted_at = Time.now.utc
+      deleted = true
+      deleted_at = Time.now.utc
       save
     end
   end
 
   def set_expiration
-    self.expires_at = team.has_monthly_subscription? ? 1.year.from_now : 1.month.from_now
+    expires_at = team.has_monthly_subscription? ? 1.year.from_now : 1.month.from_now
   end
 
   def title
     name
   end
 
   def title=(new_title)
-    self.name = new_title
+    name = new_title
   end
 
   def accepts_applications?
@@ -210,12 +202,11 @@ def alive?
   end
 
   def to_html
-    CFM::Markdown.render self.description
+    CFM::Markdown.render(self.description)
   end
 
   def to_indexed_json
     to_public_hash.deep_merge(
-
       public_id: public_id,
       name: name,
       description: description,
@@ -260,6 +251,7 @@ def assign_random_id
   end
 
   protected
+
   def set_location_city
     add_opportunity_locations_to_team
     locations = team.cities.compact.select { |city| location.include?(city) }
diff --git a/app/models/team.rb b/app/models/team.rb
@@ -44,8 +44,22 @@ class Team < ActiveRecord::Base
   has_many :members, class_name: 'Teams::Member', foreign_key: 'team_id', dependent: :delete_all
   has_many :links, class_name: 'Teams::Link', foreign_key: 'team_id', dependent: :delete_all
   has_many :locations, class_name: 'Teams::Location', foreign_key: 'team_id', dependent: :delete_all
+
+  def featured_links
+    links
+  end
+
   has_many :jobs, class_name: 'Opportunity', foreign_key: 'team_id', dependent: :destroy
 
+  #def jobs
+  #all_jobs.valid
+  #end
+
+  #Replaced with jobs
+  def all_jobs
+    jobs.order('created_at DESC')
+  end
+
   has_many :follows, class_name: 'FollowedTeam', foreign_key: 'team_id', dependent: :destroy
   has_many :followers, through: :follows, source: :team
 
@@ -173,7 +187,7 @@ def locations
 
   def locations_message
     if premium?
-      team_locations.collect(&:name).join(', ')
+      locations.collect(&:name).join(', ')
     else
       locations.join(', ')
     end
@@ -196,6 +210,11 @@ def on_team?(user)
     has_member?(user)
   end
 
+  def has_member?(user)
+    team_members.include?(user)
+  end
+
+
   def branding_hex_color
     branding || DEFAULT_HEX_BRAND
   end
@@ -330,7 +349,7 @@ def has_interview_steps?
   end
 
   def has_locations?
-    !team_locations.blank?
+    !locations.blank?
   end
 
   def has_featured_links?
@@ -616,23 +635,23 @@ def self.most_active_countries
   end
 
   def primary_address
-    team_locations.first.try(:address) || primary_address_name
+    locations.first.try(:address) || primary_address_name
   end
 
   def primary_address_name
-    team_locations.first.try(:name)
+    locations.first.try(:name)
   end
 
   def primary_address_description
-    team_locations.first.try(:description)
+    locations.first.try(:description)
   end
 
   def primary_points_of_interest
-    team_locations.first.try(:points_of_interest).to_a
+    locations.first.try(:points_of_interest).to_a
   end
 
   def cities
-    team_locations.map(&:city).reject { |city| city.blank? }
+    locations.map(&:city).reject { |city| city.blank? }
   end
 
   def generate_event
@@ -662,18 +681,10 @@ def active_job_titles
     active_jobs.collect(&:title).uniq
   end
 
-  def jobs
-    all_jobs.valid
-  end
-
-  #Replaced with jobs
-  def all_jobs
-    jobs.order('created_at DESC')
-  end
 
 
 
-  SECTION_FIELDS = %w(about headline big_quote our_challenge benefit_description_1 organization_way office_photos stack_list reason_name_1 interview_steps team_locations blog_feed)
+  SECTION_FIELDS = %w(about headline big_quote our_challenge benefit_description_1 organization_way office_photos stack_list reason_name_1 interview_steps locations blog_feed)
 
 
   def visitors_interested_in_jobs
diff --git a/app/models/teams/member.rb b/app/models/teams/member.rb
@@ -1,3 +1,5 @@
+# TODO: Move team_banner to uhhh... the Team. Maybe that would make sense.
+
 class Teams::Member < ActiveRecord::Base
   belongs_to :team, class_name: 'Team',
     foreign_key: 'team_id',
@@ -20,6 +22,18 @@ def display_name
     name || username
   end
 
+  %i(
+    banner
+    city
+    username
+    avatar
+    name
+    about
+    team_responsibilities
+  ).each do |user_method|
+    delegate user_method, to: :user
+  end
+
   [:badges, :title, :endorsements].each do |m|
     define_method(m) { user.try(m) }
   end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,4 +1,4 @@
-require "net_validators"
+require 'net_validators'
 
 class User < ActiveRecord::Base
   include ActionController::Caching::Fragments
@@ -19,8 +19,9 @@ class User < ActiveRecord::Base
   attr_protected :admin, :id, :github_id, :twitter_id, :linkedin_id, :api_key
 
   mount_uploader :avatar, AvatarUploader
-  mount_uploader :banner, BannerUploader
   mount_uploader :resume, ResumeUploader
+
+  mount_uploader :banner, BannerUploader
   process_in_background :banner, ResizeTiltShiftBannerJob
 
   RESERVED = %w{
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
@@ -148,7 +148,7 @@
             %span.team-avatar=image_tag(@user.team.avatar_url, :width => 22, :height => 22)
             %div{:itemprop => :affiliation}=truncate("#{@user.team.name}", :length => 28)
           -if viewing_self?
-            =link_to 'Leave team', team_team_member_path(@user.team, @user), :method => :delete, :confirm => "Are you sure you want to leave team #{@user.team.name}", :class => "leave-team track", 'data-action' => 'leave team', 'data-from' => 'profile page'
+            = link_to 'Leave team', team_members_path([@user.team, @user]), :method => :delete, :confirm => "Are you sure you want to leave team #{@user.team.name}", :class => "leave-team track", 'data-action' => 'leave team', 'data-from' => 'profile page'
 
       -elsif viewing_self?
         %li.team-self
diff --git a/db/migrate/20140919035232_add_score_cache_to_teams_members.rb b/db/migrate/20140919035232_add_score_cache_to_teams_members.rb
@@ -0,0 +1,5 @@
+class AddScoreCacheToTeamsMembers < ActiveRecord::Migration
+  def change
+    add_column :teams_members, :score_cache, :float
+  end
+end
diff --git a/db/migrate/20140919041335_add_team_banner_to_teams_member.rb b/db/migrate/20140919041335_add_team_banner_to_teams_member.rb
@@ -0,0 +1,5 @@
+class AddTeamBannerToTeamsMember < ActiveRecord::Migration
+  def change
+    add_column :teams_members, :team_banner, :string
+  end
+end
diff --git a/db/migrate/20140919042707_add_team_avatar_to_teams_member.rb b/db/migrate/20140919042707_add_team_avatar_to_teams_member.rb
@@ -0,0 +1,5 @@
+class AddTeamAvatarToTeamsMember < ActiveRecord::Migration
+  def change
+    add_column :teams_members, :team_avatar, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140918031936) do
+ActiveRecord::Schema.define(:version => 20140919042707) do
 
   add_extension "citext"
   add_extension "hstore"
@@ -462,11 +462,14 @@
   end
 
   create_table "teams_members", :force => true do |t|
-    t.integer  "team_id",                           :null => false
-    t.integer  "user_id",                           :null => false
-    t.datetime "created_at",                        :null => false
-    t.datetime "updated_at",                        :null => false
-    t.string   "state",      :default => "pending"
+    t.integer  "team_id",                            :null => false
+    t.integer  "user_id",                            :null => false
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
+    t.string   "state",       :default => "pending"
+    t.float    "score_cache"
+    t.string   "team_banner"
+    t.string   "team_avatar"
   end
 
   create_table "tokens", :force => true do |t|
