3 files changed, 30 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 3d23e88256..c78e602af7 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,23 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Add CollectionProxy#scope
+
+    This can be used to get a Relation from an association.
+
+    Previously we had a #scoped method, but we're deprecating that for
+    AR::Base, so it doesn't make sense to have it here.
+
+    This was requested by DHH, to facilitate code like this:
+
+        Project.scope.order('created_at DESC').page(current_page).tagged_with(@tag).limit(5).scoping do
+          @topics      = @project.topics.scope
+          @todolists   = @project.todolists.scope
+          @attachments = @project.attachments.scope
+          @documents   = @project.documents.scope
+        end
+
+    *Jon Leighton*
+
 *   Add `Relation#load`
 
     This method explicitly loads the records and then returns `self`.
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 65a5044a3d..3a7a488302 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -855,7 +855,8 @@ module ActiveRecord
         @association.scoped.scoping { yield }
       end
 
-      def spawn
+      # Returns a <tt>Relation</tt> object for the records in this association
+      def scope
         association = @association
 
         @association.scoped.extending! do
@@ -863,6 +864,9 @@ module ActiveRecord
         end
       end
 
+      # :nodoc:
+      alias spawn scope
+
       # Equivalent to <tt>Array#==</tt>. Returns +true+ if the two arrays
       # contain the same number of elements and if each element is equal
       # to the corresponding element in the other array, otherwise returns
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index b7c2bcad00..c0f1945cec 100644
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -218,6 +218,13 @@ class AssociationProxyTest < ActiveRecord::TestCase
   def test_scoped_allows_conditions
     assert developers(:david).projects.merge!(where: 'foo').where_values.include?('foo')
   end
+
+  test "getting a scope from an association" do
+    david = developers(:david)
+
+    assert david.projects.scope.is_a?(ActiveRecord::Relation)
+    assert_equal david.projects, david.projects.scope
+  end
 end
 
 class OverridingAssociationsTest < ActiveRecord::TestCase