0
@@ -1,5 +1,7 @@
0
 *2.3.0/3.0*
0
 
0
+* Added dynamic scopes ala dynamic finders #1648 [Yaroslav Markin]
0
+
0
 * Fixed that ActiveRecord::Base#new_record? should return false (not nil) for existing records #1219 [Yaroslav Markin]
0
 
0
 * I18n the word separator for error messages. Introduces the activerecord.errors.format.separator translation key.  #1294 [Akira Matsuda]

0
@@ -51,6 +51,7 @@ module ActiveRecord
0
   autoload :Callbacks, 'active_record/callbacks'
0
   autoload :Dirty, 'active_record/dirty'
0
   autoload :DynamicFinderMatch, 'active_record/dynamic_finder_match'
0
+  autoload :DynamicScopeMatch, 'active_record/dynamic_scope_match'
0
   autoload :Migration, 'active_record/migration'
0
   autoload :Migrator, 'active_record/migration'
0
   autoload :NamedScope, 'active_record/named_scope'

0
@@ -1456,7 +1456,10 @@ module ActiveRecord #:nodoc:
0
       def respond_to?(method_id, include_private = false)
0
         if match = DynamicFinderMatch.match(method_id)
0
           return true if all_attributes_exists?(match.attribute_names)
0
+        elsif match = DynamicScopeMatch.match(method_id)
0
+          return true if all_attributes_exists?(match.attribute_names)
0
         end
0
+        
0
         super
0
       end
0
 
0
@@ -1809,7 +1812,11 @@ module ActiveRecord #:nodoc:
0
         # This also enables you to initialize a record if it is not found, such as find_or_initialize_by_amount(amount)
0
         # or find_or_create_by_user_and_password(user, password).
0
         #
0
-        # Each dynamic finder or initializer/creator is also defined in the class after it is first invoked, so that future
0
+        # Also enables dynamic scopes like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that
0
+        # are turned into scoped(:conditions => ["user_name = ?", user_name]) and scoped(:conditions => ["user_name = ? AND password = ?", user_name, password])
0
+        # respectively.
0
+        #
0
+        # Each dynamic finder, scope or initializer/creator is also defined in the class after it is first invoked, so that future
0
         # attempts to use it do not run through method_missing.
0
         def method_missing(method_id, *arguments, &block)
0
           if match = DynamicFinderMatch.match(method_id)
0
@@ -1868,6 +1875,22 @@ module ActiveRecord #:nodoc:
0
               }, __FILE__, __LINE__
0
               send(method_id, *arguments, &block)
0
             end
0
+          elsif match = DynamicScopeMatch.match(method_id)
0
+            attribute_names = match.attribute_names
0
+            super unless all_attributes_exists?(attribute_names)
0
+            if match.scope?
0
+              self.class_eval %{
0
+                def self.#{method_id}(*args)                        # def self.scoped_by_user_name_and_password(*args)
0
+                  options = args.extract_options!                   #   options = args.extract_options!
0
+                  attributes = construct_attributes_from_arguments( #   attributes = construct_attributes_from_arguments(
0
+                    [:#{attribute_names.join(',:')}], args          #     [:user_name, :password], args
0
+                  )                                                 #   )
0
+                                                                    # 
0
+                  scoped(:conditions => attributes)                 #   scoped(:conditions => attributes)
0
+                end                                                 # end
0
+              }, __FILE__, __LINE__
0
+              send(method_id, *arguments)
0
+            end
0
           else
0
             super
0
           end

0
@@ -278,3 +278,23 @@ class NamedScopeTest < ActiveRecord::TestCase
0
     assert_equal post.comments.size, Post.scoped(:joins => join).scoped(:joins => join, :conditions => "posts.id = #{post.id}").size
0
   end
0
 end
0
+
0
+class DynamicScopeMatchTest < ActiveRecord::TestCase  
0
+  def test_scoped_by_no_match
0
+    assert_nil ActiveRecord::DynamicScopeMatch.match("not_scoped_at_all")
0
+  end
0
+
0
+  def test_scoped_by
0
+    match = ActiveRecord::DynamicScopeMatch.match("scoped_by_age_and_sex_and_location")
0
+    assert_not_nil match
0
+    assert match.scope?
0
+    assert_equal %w(age sex location), match.attribute_names
0
+  end
0
+end
0
+
0
+class DynamicScopeTest < ActiveRecord::TestCase
0
+  def test_dynamic_scope
1
+    assert_equal Post.scoped_by_author_id(1).find(1), Post.find(1)
0
+    assert_equal Post.scoped_by_author_id_and_title(1, "Welcome to the weblog").first, Post.find(:first, :conditions => { :author_id => 1, :title => "Welcome to the weblog"})
0
+  end
0
+end