table_differ 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3d9fc140b0f6ab8094995a54634a67f7ce9a2ff
-  data.tar.gz: 65d2e02bbd1a8a4208c42ac75f50e87eb1f20f60
+  metadata.gz: 144d5fbf2df2d63302aba0a2492629817f6d2c56
+  data.tar.gz: c2f2672f06a326665b9b1ad69cb816d765d6c105
 SHA512:
-  metadata.gz: 4bac95e5354c1d0670121ba1f39b2c77bee513b6a71ef9108c38325bbe17b6110d4d5213a524f984820716e3a452b6a9a1767a5b4cd71cb329914c5d9adb07b9
-  data.tar.gz: 0d61ed3de40746e6083a52551594c541fbbb97f8c87d6aa044df670a8e55820111e0e7b45db2929843c040284111d70176d51d75ff5e02e02b21770775e7439d
+  metadata.gz: dac4225f3b0c3b3994342f1ed435c4b6ae4503b3963e60d21434f974c13b12622ce421d96f981156d63b59a94d5ce2be7f6dc7e0b225d14e00581c8423d86963
+  data.tar.gz: d9371103866e97e4292b9fb7d1cb850737a8d75e34ffe2869dd11072f58feb60280fa32d40b86f8499a7da218b3f2f5ada03770191976ea79873458f377d1d93

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 **0.6.0**   2 July 2014
 
+* Removed models with unique_by are returned with their old ID intact.
 * Added the `unique_by` option to discover changes even when ignoring the primary key.
 * original_attributes now contains all original attributes, not just the changed ones.
 * Added the ability to delete all snapshots: `delete_snapshots(:all)`

data/lib/table_differ/version.rb

@@ -1,3 +1,3 @@
 module TableDiffer
-  VERSION = "0.6.4"
+  VERSION = "0.6.6"
 end

data/lib/table_differ.rb

@@ -50,13 +50,19 @@ module TableDiffer
       snaps.each { |name| delete_snapshot(name) }
     end
 
-    def table_differ_remap_objects params, records
+    def table_differ_remap_objects params, records, table
+      model = self
+      if table != table_name
+        model = self.dup
+        model.table_name = table
+      end
+
       params = Array(params)
       records.map do |record|
         result = record
         if record.id.nil?   # don't look up real ActiveRecord object if we already have one
           args = params.inject({}) { |hash,key| hash[key] = record[key]; hash }
-          real_record = where(args).first
+          real_record = model.where(args).first
           if real_record
             real_record.original_attributes = record.attributes
             result = real_record
@@ -90,19 +96,19 @@ module TableDiffer
       # [*added, *removed].select { |o| !o.id }.each { |o| o.instance_variable_set("@new_record", true) }
 
       if options[:unique_by]
-        added = table_differ_remap_objects(options[:unique_by], added)
-        removed = table_differ_remap_objects(options[:unique_by], removed)
+        added = table_differ_remap_objects(options[:unique_by], added, newtable)
+        removed = table_differ_remap_objects(options[:unique_by], removed, oldtable)
       end
 
-      changed = added & removed
+      changed = added.select { |a| removed.find { |r| a.id == r.id }}
       changed.each do |obj|
-        orig = removed.find { |r| r == obj }
+        orig = removed.find { |r| r.id == obj.id }
         raise "this is impossible" if orig.nil?
         obj.original_attributes = (orig.original_attributes || orig.attributes).except(*ignore)
       end
 
       added -= changed
-      removed -= changed
+      removed.reject! { |r| changed.find { |c| r.id == c.id }}
       [*added, *removed].each { |o| o.original_attributes = nil }
 
       [added, removed, changed]

data/spec/remap_spec.rb

@@ -4,6 +4,7 @@ describe "diffing a model" do
   it "detects a changed field using a single surrogate" do
     first = SurrogateModel.create!(name: 'one', original_name: 'one')
     second = SurrogateModel.create!(name: 'two', original_name: 'two')
+    secid = second.id
 
     SurrogateModel.create_snapshot('original')
 
@@ -16,7 +17,7 @@ describe "diffing a model" do
     # we can find added and changed records by surrogate IDs but, of course, can't find removed ones
     expect(added).to eq [third]
     expect(added.first.original_attributes).to eq nil
-    expect(removed.map(&:attributes)).to eq [{"id" => nil, "name" => "two", "original_name" => "two", "alternate_value" => nil}]
+    expect(removed.map(&:attributes)).to eq [{"id" => secid, "name" => "two", "original_name" => "two", "alternate_value" => nil}]
     expect(removed.first.original_attributes).to eq nil
     expect(changed).to eq [first]
     expect(changed.first.name).to eq 'uno'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_differ
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.6
 platform: ruby
 authors:
 - Scott Bronson