@@ -36,8 +36,10 @@ module Merger def merge! keep.class.transaction do + duplicates.each {|duplicate| duplicate.send(:before_merge, keep) if duplicate.respond_to?(:before_merge) } associations! - duplicates.each {|duplicate| duplicate.send(:merged_with, keep) if duplicate.respond_to?(:merged_with) } + duplicates.each {|duplicate| duplicate.send(:after_merge, keep) if duplicate.respond_to?(:after_merge) } + duplicates.each(&:destroy) if options[:destroy] end end lib/merger/merge.rb @@ -75,8 +75,9 @@ class Merger::MergeTest < Test::Unit::TestCase assert_not_nil Person.find_by_id(people(:duplicate).id) end - def test_merged_with_callback - people(:duplicate).expects(:merged_with).with(people(:original)) + def test_callback + people(:duplicate).expects(:before_merge).with(people(:original)) + people(:duplicate).expects(:after_merge).with(people(:original)) @merge.merge! end end \ No newline at end of file test/merger/merge_test.rb 32f2fbc133daf31a849f3152e1c512895faad120 Jean-Francois Couture jfcouture@gmail.com http://github.com/collectiveidea/merger/commit/079099b5e134ad40b00eed58b780923081560155 079099b5e134ad40b00eed58b780923081560155 2009-04-24T06:13:43-07:00 2009-04-17T13:30:59-07:00 changed callbacks: - renamed merged_with to after_merge - added before_merge callback, if you want to handle part of the merge manually a0a40126a01080724c864f07c87a999312a127bb Brandon Keepers brandon@collectiveidea.com