@@ -1105,6 +1105,10 @@ module ActiveRecord association = association_proxy_class.new(self, reflection) end + # if a Hash is passed in, convert it to an ActiveRecord model + # using the Hash as the initialization attributes + new_value = reflection.klass.new(new_value) if new_value.is_a?(Hash) + if association_proxy_class == HasOneThroughAssociation association.create_through_record(new_value) self.send(reflection.name, new_value) activerecord/lib/active_record/associations.rb @@ -94,6 +94,11 @@ module ActiveRecord @owner.transaction do flatten_deeper(records).each do |record| + + # if a Hash is passed in, convert it to an ActiveRecord model + # using the Hash as the initialization attributes + record = @reflection.klass.new(record) if record.is_a?(Hash) + raise_on_type_mismatch(record) add_record_to_target_with_callbacks(record) do |r| result &&= insert_record(record) unless @owner.new_record? activerecord/lib/active_record/associations/association_collection.rb @@ -189,6 +189,24 @@ class AssociationProxyTest < ActiveRecord::TestCase end end + def test_association_proxy_setter_can_take_hash + special_comment_attributes = { :body => 'Setter Takes Hash' } + + post = posts(:welcome) + post.very_special_comment = { :body => 'Setter Takes Hash' } + + assert_equal post.very_special_comment.body, special_comment_attributes[:body] + end + + def test_association_collection_can_take_hash + post_attributes = { :title => 'Setter Takes', :body => 'Hash' } + + david = authors(:david) + post = (david.posts << post_attributes).last + + assert_equal post.title, post_attributes[:title] + end + def setup_dangling_association josh = Author.create(:name => "Josh") p = Post.create(:title => "New on Edge", :body => "More cool stuff!", :author => josh) activerecord/test/cases/associations_test.rb d7462ea36550bd59cfbcd7961f5870c49bcf8963 David Dollar ddollar@gmail.com http://github.com/ddollar/rails/commit/cf8e34d59cd81c3874d97668a72bb61949c50da8 cf8e34d59cd81c3874d97668a72bb61949c50da8 2008-06-23T11:25:47-07:00 2008-06-23T11:25:47-07:00 if a hash is passed into an association proxy setter, hydrate it as an ActiveRecord model instead 87f9e27ada499c6d7047496b33d39333626227f3 David Dollar ddollar@gmail.com