Changeset 4372

Timestamp:

05/28/06 21:33:34 (2 years ago)

Author:

rick

Message:

Provide Association Extensions access to the instance that the association is being accessed from. Closes #4433 [josh@hasmanythrough.com]

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) (2 diffs)
• trunk/activerecord/test/associations_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/author.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Provide Association Extensions access to the instance that the association is being accessed from.  
+  Closes #4433 [josh@hasmanythrough.com]
-
-* Update OpenBase adaterp's maintainer's email address. Closes #5176. [Derrick Spell]

trunk/activerecord/lib/active_record/associations.rb

@@ -232 +232 @@
-    #     has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
-    #   end
+    #
+    # Some extensions can only be made to work with knowledge of the association proxy's internals.
+    # Extensions can access relevant state using accessors on the association proxy:
+    # 
+    # * +proxy_owner+ - Returns the object the association is part of.
+    # * +proxy_reflection+ - Returns the reflection object that describes the association.
+    # * +proxy_target+ - Returns the associated object for belongs_to and has_one, or the collection of associated objects for has_many and has_and_belongs_to_many.
-    #
-    # === Association Join Models

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

@@ -5 +5 @@
-      alias_method :proxy_respond_to?, :respond_to?
-      alias_method :proxy_extend, :extend
-|^proxy_respond_to\?|^proxy_extend|^send
+$|^send$|proxy_
-
-      def initialize(owner, reflection)
@@ -11 +11 @@
-        Array(reflection.options[:extend]).each { |ext| proxy_extend(ext) }
-        reset
+      end
+      
+      def proxy_owner
+        @owner
+      end
+      
+      def proxy_reflection
+        @reflection
+      end
+      
+      def proxy_target
+        @target
-      end
-      

trunk/activerecord/test/associations_test.rb

@@ -63 +63 @@
-      assert_equal "Natural Company", db["apple"].clients.first.name
-    end
+  end
+end
+
+class AssociationProxyTest < Test::Unit::TestCase
+  fixtures :authors, :posts
+  
+  def test_proxy_accessors
+    welcome = posts(:welcome)
+    assert_equal  welcome, welcome.author.proxy_owner
+    assert_equal  welcome.class.reflect_on_association(:author), welcome.author.proxy_reflection
+    welcome.author.class  # force load target
+    assert_equal  welcome.author, welcome.author.proxy_target
+
+    david = authors(:david)
+    assert_equal  david, david.posts.proxy_owner
+    assert_equal  david.class.reflect_on_association(:posts), david.posts.proxy_reflection
+    david.posts.first   # force load target
+    assert_equal  david.posts, david.posts.proxy_target
+    
+    assert_equal  david, david.posts_with_extension.testing_proxy_owner
+    assert_equal  david.class.reflect_on_association(:posts_with_extension), david.posts_with_extension.testing_proxy_reflection
+    david.posts_with_extension.first   # force load target
+    assert_equal  david.posts_with_extension, david.posts_with_extension.testing_proxy_target
-  end
-end

trunk/activerecord/test/fixtures/author.rb

@@ -4 +4 @@
-  has_many :posts_with_categories, :include => :categories, :class_name => "Post"
-  has_many :posts_with_comments_and_categories, :include => [ :comments, :categories ], :order => "posts.id", :class_name => "Post"
+  has_many :posts_with_extension, :class_name => "Post" do #, :extend => ProxyTestExtension
+    def testing_proxy_owner
+      proxy_owner
+    end
+    def testing_proxy_reflection
+      proxy_reflection
+    end
+    def testing_proxy_target
+      proxy_target
+    end
+  end
-  has_many :comments, :through => :posts
-  has_many :funky_comments, :through => :posts, :source => :comments