@@ -37,12 +37,18 @@ class Version < ActiveRecord::Base # Associations - # set the reified model's has_one associations to the current item's if possible. + # Set the reified model's has_one associations to the current item's if possible. # NOTE: with this implementation we can't restore a destroyed item's associations. - # TODO: test if item klass.send(:reflect_on_all_associations, :has_one).map(&:name).each do |assoc| - model.send "#{assoc}=", item.send(assoc) + # The only way to assign an object to a has_one association without saving + # it is to use +build_association(attributes = {})+. + associated = item.send assoc + model.send "build_#{assoc}", associated.attributes if associated + end + + klass.send(:reflect_on_all_associations, :has_many).map(&:name).each do |assoc| + #model.send "#{assoc}=", item.send(assoc) end end lib/paper_trail/version.rb @@ -78,8 +78,13 @@ class HasPaperTrailModelTest < Test::Unit::TestCase context 'and has one associated object' do setup { @wotsit = @widget.create_wotsit :name => 'John' } - should 'preserve the association when reified' do - assert_equal @wotsit, @widget.versions.last.reify.wotsit + should 'not save the associated object when reifying' do + assert_nil @widget.versions.last.reify.wotsit.id + end + + should "preserve the associated object's values when reifying" do + assert_equal @wotsit.attributes.reject{ |k,v| k == 'id' }, + @widget.versions.last.reify.wotsit.attributes.reject{ |k,v| k == 'id'} end end test/paper_trail_model_test.rb a4300d4d98acbf8cbe60808ad32602602b6ac45d Andy Stewart boss@airbladesoftware.com http://github.com/airblade/paper_trail/commit/86f89faf3b3fb577459c8fd91c5e83270af479d6 86f89faf3b3fb577459c8fd91c5e83270af479d6 2009-06-18T02:30:33-07:00 2009-06-18T02:30:33-07:00 Don't save an object when associating it to reified model. 9dbc9b1eb34db5e37a2c6782f1737114ddebc630 Andy Stewart boss@airbladesoftware.com