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 07fa702d142f366a2faeff23d47711210bac6067 Jean-Francois Couture jfcouture@gmail.com http://github.com/collectiveidea/merger/commit/32f2fbc133daf31a849f3152e1c512895faad120 32f2fbc133daf31a849f3152e1c512895faad120 2009-04-24T06:07:47-07:00 2009-04-16T08:32:34-07:00 added simple callback merged_with: if the model has a merged_with(record), it will get called after the merge useful with the :destroy => false options if you want to keep the model for historical purpose or as a safety precaution 1d9891de9be5cc754434b5d74be436a7b683f5f7 Brandon Keepers brandon@collectiveidea.com 1a9a556bbaa956ac44fe4a04da7a92b21e74b6cd Jean-Francois Couture jfcouture@gmail.com http://github.com/collectiveidea/merger/commit/07fa702d142f366a2faeff23d47711210bac6067 07fa702d142f366a2faeff23d47711210bac6067 2009-04-24T06:07:35-07:00 2009-04-16T08:23:55-07:00 add option to not destroy the duplicate record 94ba7ef3ac872c41a8adfeca4089a762c30580d0 Brandon Keepers brandon@collectiveidea.com 8eea93fb7d34441675cab2f32b0dad0f9da01c67 Jean-Francois Couture jfcouture@gmail.com http://github.com/collectiveidea/merger/commit/1a9a556bbaa956ac44fe4a04da7a92b21e74b6cd 1a9a556bbaa956ac44fe4a04da7a92b21e74b6cd 2009-04-24T06:07:01-07:00 2009-04-16T08:01:54-07:00 wrap merge! in a transaction e71420371831b028764082fb37f216960e1f3df8 Brandon Keepers brandon@collectiveidea.com b404dd9a261428bfdf34e3e001d3667cd8ee21af Jean-Francois Couture jfcouture@gmail.com http://github.com/collectiveidea/merger/commit/8eea93fb7d34441675cab2f32b0dad0f9da01c67 8eea93fb7d34441675cab2f32b0dad0f9da01c67 2009-04-24T06:05:47-07:00 2009-04-16T07:43:50-07:00 memoize the ignored associations b90a848dd744ab9764bce2c148c0c40bfe168d0b Brandon Keepers brandon@collectiveidea.com c9d3a358bf6c814a66dd861f921137060d8f080b Jean-Francois Couture jfcouture@gmail.com http://github.com/collectiveidea/merger/commit/b404dd9a261428bfdf34e3e001d3667cd8ee21af b404dd9a261428bfdf34e3e001d3667cd8ee21af 2009-04-24T06:05:27-07:00 2009-04-15T14:52:05-07:00 test for single table inheritance ebb539956ed39e16623d300dafb714216f0f7637 Brandon Keepers brandon@collectiveidea.com 14da1c51f969b1b5b6d568238bcfb4998232f85f Jean-Francois Couture jfcouture@gmail.com http://github.com/collectiveidea/merger/commit/c9d3a358bf6c814a66dd861f921137060d8f080b c9d3a358bf6c814a66dd861f921137060d8f080b 2009-04-24T06:05:14-07:00 2009-04-15T14:22:13-07:00 When merging a model with a belongs_to, keep the relation on the model to keep, instead of overwriting 9d2eacb31007c57db4b0ab0a1fae5d52620ef949 Brandon Keepers brandon@collectiveidea.com 4ce09e5dd18af0b09f4a61998fb3647cb5486271 Mourad Hammiche mourad.hammiche@elapse.fr http://github.com/collectiveidea/merger/commit/14da1c51f969b1b5b6d568238bcfb4998232f85f 14da1c51f969b1b5b6d568238bcfb4998232f85f 2009-02-05T05:41:26-08:00 2009-02-04T05:36:17-08:00 Ignore properly through associations 5b0b1db18d507017507499439673e87573e759e7 Brandon Keepers brandon@collectiveidea.com d0cc887733f404a592ca8ff3b107139e235ea240 Mourad Hammiche mourad.hammiche@elapse.fr http://github.com/collectiveidea/merger/commit/4ce09e5dd18af0b09f4a61998fb3647cb5486271 4ce09e5dd18af0b09f4a61998fb3647cb5486271 2009-02-05T05:35:00-08:00 2009-02-05T02:47:39-08:00 Added a test case for merging join model 2f195fe01846c4bc54c0f5ceceb7edaf156290af Brandon Keepers brandon@collectiveidea.com 10f3b466c794e3b3257ffd3450930277fb9b1517 Daniel Morrison daniel@collectiveidea.com http://github.com/collectiveidea/merger/commit/d0cc887733f404a592ca8ff3b107139e235ea240 d0cc887733f404a592ca8ff3b107139e235ea240 2008-10-09T07:40:30-07:00 2008-10-09T07:36:29-07:00 Small refactor of merge! 52b712a1f9250507f564990a60c0fd020210e3c2 Daniel Morrison daniel@collectiveidea.com db70e58c59b4acb31cdcd6e12e132d5e915a6804 Daniel Morrison daniel@collectiveidea.com http://github.com/collectiveidea/merger/commit/10f3b466c794e3b3257ffd3450930277fb9b1517 10f3b466c794e3b3257ffd3450930277fb9b1517 2008-10-09T07:40:19-07:00 2008-10-09T07:35:19-07:00 Fixing merge! so it actually works when called on an active record object. 25639f8c50a52a241266040c32c42d5c22dcdc5d Daniel Morrison daniel@collectiveidea.com d298994dde182243125cdefdec60926901bd6e1a Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/merger/commit/db70e58c59b4acb31cdcd6e12e132d5e915a6804 db70e58c59b4acb31cdcd6e12e132d5e915a6804 2008-08-21T12:38:08-07:00 2008-08-21T12:38:08-07:00 added :keep option for explicitly specifying which record to keep 337d3569f30729a643b530ffa52904f5a5c4bbc8 Brandon Keepers brandon@collectiveidea.com dda61ef0717b829b60a54780ee33e15f803d4e26 Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/merger/commit/d298994dde182243125cdefdec60926901bd6e1a d298994dde182243125cdefdec60926901bd6e1a 2008-08-20T21:19:21-07:00 2008-08-20T21:19:21-07:00 call #uniq on the records to remove duplicates 2a139214800dc521b87a2763c72688ae01d2996b Brandon Keepers brandon@collectiveidea.com 90c9612f851b6b1a8d0946dd3f1fd4dc934856ab Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/merger/commit/dda61ef0717b829b60a54780ee33e15f803d4e26 dda61ef0717b829b60a54780ee33e15f803d4e26 2008-08-17T20:36:24-07:00 2008-08-17T20:36:24-07:00 added :skip_association option 568539f07ffd13990eaeee252798777e26972ab6 Brandon Keepers brandon@collectiveidea.com f8db6df924b6a811af767c12b5c2a2d2c4ed7489 Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/merger/commit/90c9612f851b6b1a8d0946dd3f1fd4dc934856ab 90c9612f851b6b1a8d0946dd3f1fd4dc934856ab 2008-08-17T15:14:15-07:00 2008-08-17T15:14:15-07:00 sort records by #id instead of #created_at 537b539b25e129788d78b872fb7216e1ed896743 Brandon Keepers brandon@collectiveidea.com 60a78d6fe4a258a84f5a6f099c07aa5e7648cc1b Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/merger/commit/f8db6df924b6a811af767c12b5c2a2d2c4ed7489 f8db6df924b6a811af767c12b5c2a2d2c4ed7489 2008-08-17T15:13:56-07:00 2008-08-17T15:13:56-07:00 updated README 965f1ff08c623e06b5be2de01d846923ca16821c Brandon Keepers brandon@collectiveidea.com 6902dab810b1d542096687b4cd8ca83f40fe4be9 Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/merger/commit/60a78d6fe4a258a84f5a6f099c07aa5e7648cc1b 60a78d6fe4a258a84f5a6f099c07aa5e7648cc1b 2008-08-17T15:06:26-07:00 2008-08-17T15:06:26-07:00 remove unused files, updated README fb7da4641ff63fd991a03ca4f6c71a9990b08812 Brandon Keepers brandon@collectiveidea.com c7e9f6c261fd6b6b39ea81ead0a5e0198f453552 Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/merger/commit/6902dab810b1d542096687b4cd8ca83f40fe4be9 6902dab810b1d542096687b4cd8ca83f40fe4be9 2008-08-17T15:03:35-07:00 2008-08-17T15:03:35-07:00 minimal version of plugin for merging active record models together 498b993cacfb7f45290d03a03bcf5b8520f1b00a Brandon Keepers brandon@collectiveidea.com Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/merger/commit/c7e9f6c261fd6b6b39ea81ead0a5e0198f453552 c7e9f6c261fd6b6b39ea81ead0a5e0198f453552 2008-08-17T13:35:17-07:00 2008-08-17T13:35:17-07:00 empty plugin ae9fd1ab571595999da81753ea55b307f44e74f4 Brandon Keepers brandon@collectiveidea.com