From f0e198bfa1e3f9689e0cde1d194a44027fc90b3c Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 8 Apr 2011 23:54:54 +0100
Subject: Deprecate defining scopes with a callable (lambda, proc, etc) via the
 scope class method. Just define a class method yourself instead.

---
 activerecord/test/models/post.rb | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'activerecord/test/models/post.rb')

diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 632f83e5d4..7055380d85 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -7,12 +7,15 @@ class Post < ActiveRecord::Base
 
   scope :containing_the_letter_a, where("body LIKE '%a%'")
   scope :ranked_by_comments, order("comments_count DESC")
-  scope :limit_by, lambda {|l| limit(l) }
-  scope :with_authors_at_address, lambda { |address| {
-      :conditions => [ 'authors.author_address_id = ?', address.id ],
-      :joins => 'JOIN authors ON authors.id = posts.author_id'
-    }
-  }
+
+  def self.limit_by(l)
+    limit(l)
+  end
+
+  def self.with_authors_at_address(address)
+    where('authors.author_address_id = ?', address.id)
+      .joins('JOIN authors ON authors.id = posts.author_id')
+  end
 
   belongs_to :author do
     def greeting
@@ -27,9 +30,10 @@ class Post < ActiveRecord::Base
 
   scope :with_special_comments, :joins => :comments, :conditions => {:comments => {:type => 'SpecialComment'} }
   scope :with_very_special_comments, joins(:comments).where(:comments => {:type => 'VerySpecialComment'})
-  scope :with_post, lambda {|post_id|
-    { :joins => :comments, :conditions => {:comments => {:post_id => post_id} } }
-  }
+
+  def self.with_post(post_id)
+    joins(:comments).where(:comments => { :post_id => post_id })
+  end
 
   has_many   :comments do
     def find_most_recent
-- 
cgit v1.2.3