hashdiff 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca3dcdddb4d1143b186229d4e7d27e9ded3b752b
-  data.tar.gz: edf3e5858ede25b65ad79a9fcbbb5903ff60e5b7
+  metadata.gz: d8b0a6ff22612f26b5bca9a05e0aa2a59903d8ea
+  data.tar.gz: 239c5cc0d80aad921ab88ae4712c215598b964e5
 SHA512:
-  metadata.gz: a7f0e3f36f65b01281792c5f81fc7a3d4f1bc6b9e0bcfa47dd65202aabcb5ea93acb956e6deeadc437b6a0a812a517336eb2430b6d9f1c1056ebbb080980a1f0
-  data.tar.gz: be5bd3ca90b482c7287f65da86b64559cc83f0073901f61f549a627025c277187c160488519ea91a92ab688478bd008af7273fc725e515bd8c6f2f090a074a0a
+  metadata.gz: f32454eb369913c1ef2da688d843d3fa2f06b7d98d14cbea8a586534735cf0ac548beef2c49608e5d637d0569c08567b11b8bc89a575b01c13ec855be7f51f29
+  data.tar.gz: dcd6291074a3038274b07ea772f210050dcd8cd448ed0d9b53a47572206bae3d9a64d19b1807194fd10a5ba69e9466999889fc7b190c4e505198c72b9a8887c2

data/changelog.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.2.1 2014-7-13
+
+* yield added/deleted keys for custom comparison
+
 ## v0.2.0 2014-3-29
 
 * support custom comparison blocks

data/lib/hashdiff/diff.rb

@@ -80,18 +80,8 @@ module HashDiff
     opts[:comparison] = block if block_given?
 
     # prefer to compare with provided block
-    if opts[:comparison]
-      res = opts[:comparison].call(opts[:prefix], obj1, obj2)
-
-      # nil != false here
-      if res == false
-        return [['~', opts[:prefix], obj1, obj2]]
-      elsif res == true
-        return []
-      else
-        # compare with specified built-in helpers
-      end
-    end
+    result = custom_compare(opts[:comparison], opts[:prefix], obj1, obj2)
+    return result if result
 
     if obj1.nil? and obj2.nil?
       return []
@@ -144,7 +134,15 @@ module HashDiff
       end
 
       # add deleted properties
-      deleted_keys.each {|k| result << ['-', "#{prefix}#{k}", obj1[k]] }
+      deleted_keys.each do |k|
+        custom_result = custom_compare(opts[:comparison], "#{prefix}#{k}", obj1[k], nil)
+
+        if custom_result
+          result.concat(custom_result)
+        else
+          result << ['-', "#{prefix}#{k}", obj1[k]]
+        end
+      end
 
       # recursive comparison for common keys
       common_keys.each {|k| result.concat(diff(obj1[k], obj2[k], opts.merge(prefix: "#{prefix}#{k}"))) }
@@ -152,7 +150,13 @@ module HashDiff
       # added properties
       obj2.each do |k, v|
         unless obj1.key?(k)
-          result << ['+', "#{prefix}#{k}", obj2[k]]
+          custom_result = custom_compare(opts[:comparison], "#{prefix}#{k}", nil, v)
+
+          if custom_result
+            result.concat(custom_result)
+          else
+            result << ['+', "#{prefix}#{k}", obj2[k]]
+          end
         end
       end
     else

data/lib/hashdiff/util.rb

@@ -108,4 +108,20 @@ module HashDiff
     return true if !strict && obj1.is_a?(Numeric) && obj2.is_a?(Numeric)
     obj1.is_a?(obj2.class) && obj2.is_a?(obj1.class)
   end
+
+  # @private
+  #
+  # try custom comparison
+  def self.custom_compare(method, key, obj1, obj2)
+    if method
+      res = method.call(key, obj1, obj2)
+
+      # nil != false here
+      if res == false
+        return [['~', key, obj1, obj2]]
+      elsif res == true
+        return []
+      end
+    end
+  end
 end

data/lib/hashdiff/version.rb

@@ -1,3 +1,3 @@
 module HashDiff
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/hashdiff/best_diff_spec.rb

@@ -24,7 +24,7 @@ describe HashDiff do
     diff = HashDiff.best_diff(a, b) do |path, obj1, obj2|
       case path
       when /^x\[.\]\..$/
-        obj1.length == obj2.length
+        obj1.length == obj2.length if obj1 and obj2
       end
     end
 

data/spec/hashdiff/diff_spec.rb

@@ -204,6 +204,19 @@ describe HashDiff do
       diff.should == [['~', 'b', 'boat', 'truck']]
     end
 
+    it 'should yield added keys' do
+      x = {a:'car', b:'boat'}
+      y = {a:'car'}
+
+      diff = HashDiff.diff(x, y) do |prefix, obj1, obj2|
+        case prefix
+        when /b/
+          true
+        end
+      end
+      diff.should == []
+    end
+
     it 'should compare with both proc and :strip when both provided' do
       diff = HashDiff.diff(a, b, :strip => true) do |prefix, obj1, obj2|
         case prefix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashdiff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Liu Fengyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec