table_differ 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144d5fbf2df2d63302aba0a2492629817f6d2c56
-  data.tar.gz: c2f2672f06a326665b9b1ad69cb816d765d6c105
+  metadata.gz: 483254dc425f015ad634c390fed0da2da47a5ce8
+  data.tar.gz: 4762ef0f13da2607302ec7da25da793fb5b1699c
 SHA512:
-  metadata.gz: dac4225f3b0c3b3994342f1ed435c4b6ae4503b3963e60d21434f974c13b12622ce421d96f981156d63b59a94d5ce2be7f6dc7e0b225d14e00581c8423d86963
-  data.tar.gz: d9371103866e97e4292b9fb7d1cb850737a8d75e34ffe2869dd11072f58feb60280fa32d40b86f8499a7da218b3f2f5ada03770191976ea79873458f377d1d93
+  metadata.gz: d3f94c48d05492a4c329543d00f4e97e72f47c620352b8acfa71e03d75dc4f4c6bcd96b8248970c491808c97e2e18710e4fa7461bf6afb4d02acede108e76d7e
+  data.tar.gz: 3934e31a415eab2da16340d3adcf647d4554264973263304c51dce40f24813be1ca3c9d32a3931e40c812b035a6a77acf3d69c69fd6e73711e4ca6d2d333b546

data/lib/table_differ/version.rb

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

data/lib/table_differ.rb

@@ -64,6 +64,9 @@ module TableDiffer
           args = params.inject({}) { |hash,key| hash[key] = record[key]; hash }
           real_record = model.where(args).first
           if real_record
+            if model != self
+              real_record = self.new(real_record.attributes)  # convert fake model to real model
+            end
             real_record.original_attributes = record.attributes
             result = real_record
           end
@@ -100,15 +103,15 @@ module TableDiffer
         removed = table_differ_remap_objects(options[:unique_by], removed, oldtable)
       end
 
-      changed = added.select { |a| removed.find { |r| a.id == r.id }}
+      changed = added & removed
       changed.each do |obj|
-        orig = removed.find { |r| r.id == obj.id }
+        orig = removed.find { |r| r == obj }
         raise "this is impossible" if orig.nil?
         obj.original_attributes = (orig.original_attributes || orig.attributes).except(*ignore)
       end
 
       added -= changed
-      removed.reject! { |r| changed.find { |c| r.id == c.id }}
+      removed -= changed
       [*added, *removed].each { |o| o.original_attributes = nil }
 
       [added, removed, changed]

data/spec/remap_spec.rb

@@ -17,7 +17,8 @@ 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" => secid, "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).to eq [second]
     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.6
+  version: 0.6.8
 platform: ruby
 authors:
 - Scott Bronson