Changeset 8003

Timestamp:

10/23/07 17:39:35 (2 years ago)

Author:

bitsweat

Message:

Assigning an instance of a foreign class to a composed_of aggregate calls an optional conversion block. Refactor and simplify composed_of implementation. Closes #6322.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/aggregations.rb (modified) (3 diffs)
• trunk/activerecord/test/fixtures/customer.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Assigning an instance of a foreign class to a composed_of aggregate calls an optional conversion block. Refactor and simplify composed_of implementation.  #6322 [brandon, Chris Cruft]
-
-* Assigning nil to a composed_of aggregate also sets its immediate value to nil.  #9843 [Chris Cruft]

trunk/activerecord/lib/active_record/aggregations.rb

@@ -123 +123 @@
-      #   This defaults to +false+.
-      #
+      # An optional block can be passed to convert the argument that is passed to the writer method into an instance of
+      # <tt>:class_name</tt>. The block will only be called if the arguement is not already an instance of <tt>:class_name</tt>.
+      #
-      # Option examples:
-      #   composed_of :temperature, :mapping => %w(reading celsius)
- :balance, :class_name => "Money", :mapping => %w(balance amount)
+(:balance, :class_name => "Money", :mapping => %w(balance amount)) {|balance| balance.to_money }
-      #   composed_of :address, :mapping => [ %w(address_street street), %w(address_city city) ]
-      #   composed_of :gps_location
-      #   composed_of :gps_location, :allow_nil => true
-      #
-
+, &block
-        options.assert_valid_keys(:class_name, :mapping, :allow_nil)
-
@@ -136 +139 @@
-        class_name  = options[:class_name] || name.camelize
-        mapping     = options[:mapping]    || [ name, name ]
+        mapping     = [ mapping ] unless mapping.first.is_a?(Array)
-        allow_nil   = options[:allow_nil]  || false
-
-        reader_method(name, class_name, mapping, allow_nil)
-
+, block
-        
-        create_reflection(:composed_of, part_id, options, self)
@@ -146 +150 @@
-      private
-        def reader_method(name, class_name, mapping, allow_nil)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-          end
-
-          module_eval <<-end_eval, __FILE__, __LINE__
-            def #{name}(force_reload = false)
-              if (@#{name}.nil? || force_reload) && #{allow_nil_condition}
-                @#{name} = #{class_name}.new(#{mapping.collect { |pair| "read_attribute(\"#{pair.first}\")"}.join(", ")})
-              end
-              return @#{name}
-            end
-          end_eval
-        end
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-              end
-
-
-
-
-
-
-
-
+
-          end
-        end

trunk/activerecord/test/fixtures/customer.rb

@@ -1 +1 @@
-class Customer < ActiveRecord::Base
-  composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ], :allow_nil => true
- :balance, :class_name => "Money", :mapping => %w(balance amount)
+(:balance, :class_name => "Money", :mapping => %w(balance amount)) { |balance| balance.to_money }
-  composed_of :gps_location, :allow_nil => true
-end