Permalink
Browse files

Allow nested attributes in associations to update values in it's owne…

…r object. Fixes a regression from 3.0.x
  • Loading branch information...
1 parent b6105b0 commit 774ff18c095145f544e845dbb940378546748969 @akaspick committed Dec 15, 2011
@@ -230,6 +230,8 @@ def association_class
end
def build_record(attributes, options)
+ attributes = (attributes || {}).reverse_merge(creation_attributes)
+
reflection.build_association(attributes, options) do |record|
record.assign_attributes(
create_scope.except(*record.changed),
@@ -1776,6 +1776,7 @@ def assign_attributes(new_attributes, options = {})
attributes = new_attributes.stringify_keys
multi_parameter_attributes = []
+ nested_parameter_attributes = []
@mass_assignment_options = options
unless options[:without_protection]
@@ -1786,12 +1787,21 @@ def assign_attributes(new_attributes, options = {})
if k.include?("(")
multi_parameter_attributes << [ k, v ]
elsif respond_to?("#{k}=")
- send("#{k}=", v)
+ if v.is_a?(Hash)
+ nested_parameter_attributes << [ k, v ]
+ else
+ send("#{k}=", v)
+ end
else
raise(UnknownAttributeError, "unknown attribute: #{k}")
end
end
+ # assign any deferred nested attributes after the base attributes have been set
+ nested_parameter_attributes.each do |k,v|
+ send("#{k}=", v)
+ end
+
@mass_assignment_options = nil
assign_multiparameter_attributes(multi_parameter_attributes)
end
@@ -617,6 +617,11 @@ def test_should_take_a_hash_with_composite_id_keys_and_assign_the_attributes_to_
assert_equal ['Grace OMalley', 'Privateers Greed'], [@child_1.name, @child_2.name]
end
+ def test_should_take_a_hash_with_owner_attributes_and_assign_the_attributes_to_the_associated_model
+ @pirate.birds.create :name => 'bird', :pirate_attributes => {:id => @pirate.id.to_s, :catchphrase => 'Holla!'}
+ assert_equal 'Holla!', @pirate.reload.catchphrase
+ end
+
def test_should_raise_RecordNotFound_if_an_id_is_given_but_doesnt_return_a_record
assert_raise_with_message ActiveRecord::RecordNotFound, "Couldn't find #{@child_1.class.name} with ID=1234567890 for Pirate with ID=#{@pirate.id}" do
@pirate.attributes = { association_getter => [{ :id => 1234567890 }] }
@@ -1,9 +1,12 @@
class Bird < ActiveRecord::Base
+ belongs_to :pirate
validates_presence_of :name
+ accepts_nested_attributes_for :pirate
+
attr_accessor :cancel_save_from_callback
before_save :cancel_save_callback_method, :if => :cancel_save_from_callback
def cancel_save_callback_method
false
end
-end
+end

0 comments on commit 774ff18

Please sign in to comment.