hashdiff_sym 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1c3c20780bd5ac5b4651aa308d5efe2978c1d87
-  data.tar.gz: 5ed5b1c281805ea581428c5574dc5ff7d93f2237
+  metadata.gz: a995af36ade64ace421f4c1f77cbd795503ff396
+  data.tar.gz: 5884eee448ee410b475a2e11d2859e53b874db3b
 SHA512:
-  metadata.gz: 73de6c8ca7869ea1990376f6e3a4c8daedfe9e16f50e15b920df5efb69f59dc84b2bdb81f920c807fb57e46d53c70209f72ffe00494d81cf1fe83b3c81d68a3b
-  data.tar.gz: 26ff1285b00bc83824f946e06499a2c2b371969b0149eeb09245d2e41d66930008d626656fa8fc3e2947bf206a307b1a8f28e083cdec29a8c8d03b6e20899e7c
+  metadata.gz: a6e5543067e990081a527d7936c2af1116457e797951d6c3b1cc7f05e01ea9a7ba1b8b013f061d53583d81a924cb8404b4c1b0e25eead61f31538f45cbffd2d1
+  data.tar.gz: 416125f2896fd4d3736ca30a4de4358c734d71ee337ab096363e93e6564bf7210b1a89ea0601b97d7cbaa612a7fe414aa6e60b27a2ec3cfc2baca0ccf12db734

data/README.md

@@ -17,6 +17,16 @@ diff = HashDiffSym.diff(a, b)
 HashDiffSym.patch!(a, diff).should == b
 ```
 
+## Installing
+
+Add this to your Gemfile
+
+`gem "hashdiff_sym"`
+
+or just run
+
+`gem install hashdiff_sym`
+
 ## License
 
 HashDiffSym is distributed under the MIT-LICENSE.

data/lib/hashdiff_sym/diff.rb

@@ -127,7 +127,7 @@ module HashDiffSym
       added_keys = obj2.keys - obj1.keys
 
       # add deleted properties
-      deleted_keys.sort.each do |k|
+      deleted_keys.to_s_sort.each do |k|
         custom_result = custom_compare(opts[:comparison], "#{prefix}#{export_key(k)}", obj1[k], nil)
 
         if custom_result
@@ -138,10 +138,10 @@ module HashDiffSym
       end
 
       # recursive comparison for common keys
-      common_keys.sort.each {|k| result.concat(diff(obj1[k], obj2[k], opts.merge(:prefix => "#{prefix}#{export_key(k)}"))) }
+      common_keys.to_s_sort.each {|k| result.concat(diff(obj1[k], obj2[k], opts.merge(:prefix => "#{prefix}#{export_key(k)}"))) }
 
       # added properties
-      added_keys.sort.each do |k|
+      added_keys.to_s_sort.each do |k|
         unless obj1.key?(k)
           custom_result = custom_compare(opts[:comparison], "#{prefix}#{export_key(k)}", nil, obj2[k])
 

data/lib/hashdiff_sym/util.rb

@@ -145,3 +145,9 @@ module HashDiffSym
     end
   end
 end
+
+class Array
+  def to_s_sort
+    self.sort { |a, b| a.to_s <=> b.to_s }
+  end
+end

data/lib/hashdiff_sym/version.rb

@@ -1,3 +1,3 @@
 module HashDiffSym
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/hashdiff_sym/diff_spec.rb

@@ -149,6 +149,11 @@ describe HashDiffSym do
     diff.should == [['-', 'a.:x', 2], ['-', 'a.:z', 4], ['-', 'b.:x', 3], ["-", "b.:z[0]", 1], ["+", "b.:z[2]", 4], ['+', 'b.:y', 3]]
   end
 
+  it "should compare hashes with both string and symbols keys" do
+    diff = HashDiffSym.diff({}, { :symbol_key => 1, "string_key" => 1})
+    diff.should == [["+", "string_key", 1], ["+", ":symbol_key", 1]]
+  end
+
   context 'when :numeric_tolerance requested' do
     it "should be able to diff changes in hash value" do
       a = {'a' => 0.558, 'b' => 0.0, 'c' => 0.65, 'd' => 'fin'}

data/spec/hashdiff_sym/patch_spec.rb

@@ -151,4 +151,11 @@ describe HashDiffSym do
     diff = HashDiffSym.diff(a, b)
     HashDiffSym.patch!(a, diff).should == b
   end
+
+  it "should patch hashes with both symbol and string keys correctly" do
+    a = {a: 3, "b" => 4}
+    b = {a: {a1: 1, a2: 2}, "b" => 5}
+    diff = HashDiffSym.diff(a, b)
+    HashDiffSym.patch!(a, diff).should == b
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashdiff_sym
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Liu Fengyun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec