hashdiff 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzRhMjNjMjJlMDRmMzk4MjM1ZWIxMTlkMmM5MjU0NjAyZDQ2MjdjNg==
-  data.tar.gz: !binary |-
-    MzdlMDAxNTk0ZjA4ODNhOWIxNjdiYThhYjNlYjhkODJiYTlhYWJiMQ==
+SHA1:
+  metadata.gz: 47874e343c8689f4bef1893d4d855a9e606d96d8
+  data.tar.gz: a94c89c5a54b9bbef455ba24abcccefdc19bbae6
 SHA512:
-  metadata.gz: !binary |-
-    OGE1NDRmNjA2MThmZDJlZDA1YmI2Nzg2YmQ0OTQyMzVlZGNiZDJiYWQ4Y2Y5
-    ODdiNDdkYTRlMjZkNWFmNTE5NmEzMjRhYTVjZGY5YTEzZjEyMDA1YmZlY2E2
-    ZWRiNjFiOTdiNGU4YzRkYTZhZjk0YjMxNWNmN2Q3ODg5MGY5YTU=
-  data.tar.gz: !binary |-
-    ZWU1MDBjNTNkZTZjMTRiYzBhOTY2NGY1OGM4OWE0MjI1OGM4ZjM1YzFiMDVk
-    NGRkNzYxZjc1NzkzODEyMzk4OTgzOWQxMjg3Y2IxYjE3ZDE2ZTFjOGY3ZjJj
-    MGMxZDNiNDcyNTBmZjM3YWYxZjc4ZTMyNmE4MTAxYTk0NTJlYWQ=
+  metadata.gz: 6d24313cccba03484ba19fb169676451850786a3d4683631dba275b4da78731fa5251adfb39b8e3c03b7e1388685fad2d7341028888f8198318a5e7d5b4bcb5e
+  data.tar.gz: 62b2ab8565244c3f09f872f00447b837c413f1be2e8275e1f4153e5b3d3fcb1528768f36e0e205d2a24d9742348e70d331a37e40355e79d551f3aa51a411d8b3

data/.travis.yml

@@ -1,6 +1,6 @@
+sudo: false
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.1

data/changelog.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.3.1 2016-11-24
+
+* fix an error when a hash has mixed types #26
+
 ## v0.3.0 2016-2-11
 
 * support `:case_insensitive` option

data/lib/hashdiff/diff.rb

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

data/lib/hashdiff/util.rb

@@ -55,7 +55,7 @@ module HashDiff
   # e.g. "a.b[3].c" => ['a', 'b', 3, 'c']
   def self.decode_property_path(path, delimiter='.')
     parts = path.split(delimiter).collect do |part|
-      if part =~ /^(\w*)\[(\d+)\]$/
+      if part =~ /^(.*)\[(\d+)\]$/
         if $1.size > 0
           [$1, $2.to_i]
         else

data/lib/hashdiff/version.rb

@@ -1,3 +1,3 @@
 module HashDiff
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/hashdiff/diff_spec.rb

@@ -22,6 +22,26 @@ describe HashDiff do
     diff.should == []
   end
 
+  it "should be able to diff two equal hashes with mixed key types" do
+    a = { 'a' => 1, :b => 1 }
+    diff = HashDiff.diff(a, a)
+    diff.should == []
+  end
+
+  it "should be able to diff if mixed key types are removed" do
+    a = { 'a' => 1, :b => 1 }
+    b = {}
+    diff = HashDiff.diff(a, b)
+    diff.should == [["-", "a", 1], ["-", "b", 1]]
+  end
+
+  it "should be able to diff if mixed key types are added" do
+    a = { 'a' => 1, :b => 1 }
+    b = {}
+    diff = HashDiff.diff(b, a)
+    diff.should == [["+", "a", 1], ["+", "b", 1]]
+  end
+
   it "should be able to diff two hashes with equivalent numerics, when strict is false" do
     diff = HashDiff.diff({ 'a' => 2.0, 'b' => 2 }, { 'a' => 2, 'b' => 2.0 }, :strict => false)
     diff.should == []

data/spec/hashdiff/patch_spec.rb

@@ -61,6 +61,18 @@ describe HashDiff do
     HashDiff.unpatch!(b, diff).should == a
   end
 
+  it "should be able to patch array under hash key with non-word characters" do
+    a = {"a" => 1, "b-b" => [1, 2]}
+    b = {"a" => 1, "b-b" => [2, 1]}
+    diff = HashDiff.diff(a, b)
+
+    HashDiff.patch!(a, diff).should == b
+
+    a = {"a" => 1, "b-b" => [1, 2]}
+    b = {"a" => 1, "b-b" => [2, 1]}
+    HashDiff.unpatch!(b, diff).should == a
+  end
+
   it "should be able to patch hash value removal" do
     a = {"a" => 1, "b" => {"b1" => 1, "b2" =>2}}
     b = {"a" => 1}
@@ -133,4 +145,17 @@ describe HashDiff do
     HashDiff.unpatch!(b, diff).should == a
   end
 
+  it "should be able to patch hash value removal with custom delimiter" do
+    a = {"a" => 1, "b" => {"b1" => 1, "b2" =>2}}
+    b = {"a" => 1, "b" => {"b1" => 3} }
+    diff = HashDiff.diff(a, b, :delimiter => "\n")
+
+    HashDiff.patch!(a, diff, :delimiter => "\n").should == b
+
+    a = {"a" => 1, "b" => {"b1" => 1, "b2" =>2}}
+    b = {"a" => 1, "b" => {"b1" => 3} }
+    HashDiff.unpatch!(b, diff, :delimiter => "\n").should == a
+  end
+
+
 end

data/spec/hashdiff/util_spec.rb

@@ -14,64 +14,64 @@ describe HashDiff do
   it "should be able to tell similiar hash" do
     a = {'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5}
     b = {'a' => 1, 'b' => 2, 'c' => 3, 'e' => 5}
-    HashDiff.similar?(a, b).should be_true
-    HashDiff.similar?(a, b, :similarity => 1).should be_false
+    HashDiff.similar?(a, b).should be true
+    HashDiff.similar?(a, b, :similarity => 1).should be false
   end
 
   it "should be able to tell similiar hash with values within tolerance" do
     a = {'a' => 1.5, 'b' => 2.25, 'c' => 3, 'd' => 4, 'e' => 5}
     b = {'a' => 1.503, 'b' => 2.22, 'c' => 3, 'e' => 5}
-    HashDiff.similar?(a, b, :numeric_tolerance => 0.05).should be_true
-    HashDiff.similar?(a, b).should be_false
+    HashDiff.similar?(a, b, :numeric_tolerance => 0.05).should be true
+    HashDiff.similar?(a, b).should be false
   end
 
   it "should be able to tell numbers and strings" do
-    HashDiff.similar?(1, 2).should be_false
-    HashDiff.similar?("a", "b").should be_false
-    HashDiff.similar?("a", [1, 2, 3]).should be_false
-    HashDiff.similar?(1, {'a' => 1, 'b' => 2, 'c' => 3, 'e' => 5}).should be_false
+    HashDiff.similar?(1, 2).should be false
+    HashDiff.similar?("a", "b").should be false
+    HashDiff.similar?("a", [1, 2, 3]).should be false
+    HashDiff.similar?(1, {'a' => 1, 'b' => 2, 'c' => 3, 'e' => 5}).should be false
   end
 
   it "should be able to tell true when similarity == 0.5" do
     a = {"value" => "New1", "onclick" => "CreateNewDoc()"}
     b = {"value" => "New", "onclick" => "CreateNewDoc()"}
 
-    HashDiff.similar?(a, b, :similarity => 0.5).should be_true
+    HashDiff.similar?(a, b, :similarity => 0.5).should be true
   end
 
   it "should be able to tell false when similarity == 0.5" do
     a = {"value" => "New1", "onclick" => "open()"}
     b = {"value" => "New", "onclick" => "CreateNewDoc()"}
 
-    HashDiff.similar?(a, b, :similarity => 0.5).should be_false
+    HashDiff.similar?(a, b, :similarity => 0.5).should be false
   end
 
   describe '.compare_values' do
     it "should compare numeric values exactly when no tolerance" do
-      expect(HashDiff.compare_values(10.004, 10.003)).to be_false
+      expect(HashDiff.compare_values(10.004, 10.003)).to be false
     end
 
     it "should allow tolerance with numeric values" do
-      expect(HashDiff.compare_values(10.004, 10.003, :numeric_tolerance => 0.01)).to be_true
+      expect(HashDiff.compare_values(10.004, 10.003, :numeric_tolerance => 0.01)).to be true
     end
 
     it "should compare other objects with or without tolerance" do
-      expect(HashDiff.compare_values('hats', 'ninjas')).to be_false
-      expect(HashDiff.compare_values('hats', 'ninjas', :numeric_tolerance => 0.01)).to be_false
-      expect(HashDiff.compare_values('horse', 'horse')).to be_true
+      expect(HashDiff.compare_values('hats', 'ninjas')).to be false
+      expect(HashDiff.compare_values('hats', 'ninjas', :numeric_tolerance => 0.01)).to be false
+      expect(HashDiff.compare_values('horse', 'horse')).to be true
     end
 
     it 'should compare strings exactly by default' do
-      expect(HashDiff.compare_values(' horse', 'horse')).to be_false
-      expect(HashDiff.compare_values('horse', 'Horse')).to be_false
+      expect(HashDiff.compare_values(' horse', 'horse')).to be false
+      expect(HashDiff.compare_values('horse', 'Horse')).to be false
     end
 
     it 'should strip strings before comparing when requested' do
-      expect(HashDiff.compare_values(' horse', 'horse', :strip => true)).to be_true
+      expect(HashDiff.compare_values(' horse', 'horse', :strip => true)).to be true
     end
 
     it "should ignore string case when requested" do
-      expect(HashDiff.compare_values('horse', 'Horse', :case_insensitive => true)).to be_true
+      expect(HashDiff.compare_values('horse', 'Horse', :case_insensitive => true)).to be true
     end
 
   end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: hashdiff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Liu Fengyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! ' HashDiff is a diff lib to compute the smallest difference between
-  two hashes. '
+description: " HashDiff is a diff lib to compute the smallest difference between two
+  hashes. "
 email:
 - liufengyunchina@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.md
@@ -93,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: HashDiff is a diff lib to compute the smallest difference between two hashes.