Changeset 4206

Timestamp:

04/11/06 01:10:42 (3 years ago)

Author:

rick

Message:

Allow multiple association extensions with :extend option (closes #4666) [Josh Susser]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/association_proxy.rb (modified) (1 diff)
• trunk/activerecord/test/associations_extensions_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/developer.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ +1 @@
+*SVN*
+
+* Allow multiple association extensions with :extend option (closes #4666) [Josh Susser]
+
+    class Account < ActiveRecord::Base
+      has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
+    end
+
+
-*1.14.2* (April 9th, 2005)
-

trunk/activerecord/lib/active_record/associations.rb

@@ -214 +214 @@
-    #   class Company < ActiveRecord::Base
-    #     has_many :people, :extend => FindOrCreateByNameExtension
+    #   end
+    #
+    # If you need to use multiple named extension modules, you can specify an array of modules with the :extend option.
+    # In the case of name conflicts between methods in the modules, methods in modules later in the array supercede
+    # those earlier in the array. Example:
+    #
+    #   class Account < ActiveRecord::Base
+    #     has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
-    #   end
-    #

trunk/activerecord/lib/active_record/associations/association_proxy.rb

@@ -9 +9 @@
-      def initialize(owner, reflection)
-        @owner, @reflection = owner, reflection
-proxy_extend(reflection.options[:extend]) if reflection.options[:extend]
+Array(reflection.options[:extend]).each { |ext| proxy_extend(ext) }
-        reset
-      end

trunk/activerecord/test/associations_extensions_test.rb

@@ -19 +19 @@
-    assert_equal projects(:action_controller), developers(:david).projects_extended_by_name.find_most_recent
-  end
+
+  def test_named_two_extensions_on_habtm
+    assert_equal projects(:action_controller), developers(:david).projects_extended_by_name_twice.find_most_recent
+    assert_equal projects(:active_record), developers(:david).projects_extended_by_name_twice.find_least_recent
+  end
-  
-  def test_marshalling_extensions

trunk/activerecord/test/fixtures/developer.rb

@@ -2 +2 @@
-  def find_most_recent
-    find(:first, :order => "id DESC")
+  end
+end
+
+module DeveloperProjectsAssociationExtension2
+  def find_least_recent
+    find(:first, :order => "id ASC")
-  end
-end
@@ -17 +23 @@
-      :association_foreign_key => "project_id",
-      :extend => DeveloperProjectsAssociationExtension
+
+  has_and_belongs_to_many :projects_extended_by_name_twice, 
+      :class_name => "Project", 
+      :join_table => "developers_projects", 
+      :association_foreign_key => "project_id",
+      :extend => [DeveloperProjectsAssociationExtension, DeveloperProjectsAssociationExtension2]
-
-  has_and_belongs_to_many :special_projects, :join_table => 'developers_projects', :association_foreign_key => 'project_id'