Revert "Deprecate defining scopes with a callable (lambda, proc, etc) via the scope class method. Just define a class method yourself instead."

This reverts commit f0e198bfa1e3f9689e0cde1d194a44027fc90b3c.

Conflicts:

	activerecord/test/models/post.rb

1 files changed, 11 insertions, 15 deletions

diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb
index 60e750e6c4..6440dbe8ab 100644
--- a/activerecord/test/models/topic.rb
+++ b/activerecord/test/models/topic.rb
@@ -1,20 +1,10 @@
 class Topic < ActiveRecord::Base
   scope :base
-
-  ActiveSupport::Deprecation.silence do
-    scope :written_before, lambda { |time|
-      if time
-        { :conditions => ['written_on < ?', time] }
-      end
-    }
-
-    scope :with_object, Class.new(Struct.new(:klass)) {
-      def call
-        klass.where(:approved => true)
-      end
-    }.new(self)
-  end
-
+  scope :written_before, lambda { |time|
+    if time
+      { :conditions => ['written_on < ?', time] }
+    end
+  }
   scope :approved, :conditions => {:approved => true}
   scope :rejected, :conditions => {:approved => false}
 
@@ -29,6 +19,12 @@ class Topic < ActiveRecord::Base
     end
   end
 
+  scope :with_object, Class.new(Struct.new(:klass)) {
+    def call
+      klass.where(:approved => true)
+    end
+  }.new(self)
+
   module NamedExtension
     def two
       2