fix all the scopes

seuros · seuros · commit e7e4d0442549 · 2015-08-05T13:33:47.000+01:00
diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -30,11 +30,11 @@ class Comment < ActiveRecord::Base
   after_create :generate_event
   after_save :commented_callback
 
-  default_scope order: 'likes_cache DESC, created_at ASC'
+  default_scope { order('likes_cache DESC').order(:created_at) }
 
   belongs_to :user, autosave: true
 
-  scope :showable, ->{ with_states(:active,:reported_as_spam) }
+  scope :showable, -> { with_states(:active, :reported_as_spam) }
 
   alias_method :author, :user
   alias_attribute :body, :comment
diff --git a/app/models/like.rb b/app/models/like.rb
@@ -22,7 +22,7 @@ class Like < ActiveRecord::Base
   validates :value, presence: true, numericality: { min: 1 }
   after_save :liked_callback
 
-  scope :protips, where(likable_type: 'Protip')
+  scope :protips, -> { where(likable_type: 'Protip') }
   scope :protips_score, ->(protip_ids) { protips.where(likable_id: protip_ids).group(:likable_id).select('SUM(likes.value) as like_score') }
 
   def liked_callback
diff --git a/app/models/network.rb b/app/models/network.rb
@@ -32,8 +32,8 @@ class Network < ActiveRecord::Base
   before_save :cache_counts!
   after_create :assign_members
 
-  scope :most_protips, order('protips_count_cache DESC')
-  scope :featured, where(featured: true)
+  scope :most_protips, ->{ order('protips_count_cache DESC') }
+  scope :featured, ->{ where(featured: true)}
 
   class << self
     def all_with_tag(tag_name)
diff --git a/app/models/opportunity.rb b/app/models/opportunity.rb
@@ -56,12 +56,12 @@ class Opportunity < ActiveRecord::Base
   after_create :pay_for_it!
 
   #this scope should be renamed.
-  scope :valid, where(deleted: false).where('expires_at > ?', Time.now).order('created_at DESC')
+  scope :valid, -> { where(deleted: false).where('expires_at > ?', Time.now).order('created_at DESC') }
   scope :by_city, ->(city) { where('LOWER(location_city) LIKE ?', "%#{city.try(:downcase)}%") }
   scope :by_tag, ->(tag) { where('LOWER(cached_tags) LIKE ?', "%#{tag}%") unless tag.nil? }
   scope :by_query, ->(query) { where("name ~* ? OR description ~* ? OR cached_tags ~* ?", query, query, query) }
   #remove default scope
-  default_scope valid
+  default_scope { valid }
 
   HUMANIZED_ATTRIBUTES = { name: 'Title' }
 
diff --git a/app/models/protip.rb b/app/models/protip.rb
@@ -124,8 +124,8 @@ class Protip < ActiveRecord::Base
 
   scope :for_topic, ->(topic) { any_topics([topic]) }
 
-  scope :with_upvotes, joins("INNER JOIN (#{Like.select('likable_id, SUM(likes.value) as upvotes').where(likable_type: 'Protip').group([:likable_type, :likable_id]).to_sql}) AS upvote_scores ON upvote_scores.likable_id=protips.id")
-  scope :trending, -> {order(:score).reverse_order}
+  scope :with_upvotes, -> { joins("INNER JOIN (#{Like.select('likable_id, SUM(likes.value) as upvotes').where(likable_type: 'Protip').group([:likable_type, :likable_id]).to_sql}) AS upvote_scores ON upvote_scores.likable_id=protips.id") }
+  scope :trending, -> { order(:score).reverse_order }
   scope :flagged, -> { where(state: :reported) }
 
   state_machine initial: :active do
diff --git a/app/models/skill.rb b/app/models/skill.rb
@@ -42,8 +42,8 @@ class Skill < ActiveRecord::Base
   serialize :links,  ActiveRecord::Coders::JSON
 
 
-  default_scope where(deleted: false)
-  scope :deleted, ->{unscoped.where(deleted: true)}
+  default_scope {where(deleted: false)}
+  scope :deleted, -> { unscoped.where(deleted: true) }
 
   def self.tokenize(value)
     v = value.to_s.gsub('&', 'and').downcase.gsub(/\s|\./, BLANK)
