hashdiff 0.3.7 → 0.3.8

data/spec/hash_diff/lcs_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe HashDiff do
+  it 'is able to find LCS between two equal array' do
+    a = [1, 2, 3]
+    b = [1, 2, 3]
+
+    lcs = described_class.lcs(a, b)
+    lcs.should == [[0, 0], [1, 1], [2, 2]]
+  end
+
+  it 'is able to find LCS between two close arrays' do
+    a = [1.05, 2, 3.25]
+    b = [1.06, 2, 3.24]
+
+    lcs = described_class.lcs(a, b, numeric_tolerance: 0.1)
+    lcs.should == [[0, 0], [1, 1], [2, 2]]
+  end
+
+  it 'strips strings when finding LCS if requested' do
+    a = %w[foo bar baz]
+    b = [' foo', 'bar', 'zab']
+
+    lcs = described_class.lcs(a, b, strip: true)
+    lcs.should == [[0, 0], [1, 1]]
+  end
+
+  it 'is able to find LCS with one common elements' do
+    a = [1, 2, 3]
+    b = [1, 8, 7]
+
+    lcs = described_class.lcs(a, b)
+    lcs.should == [[0, 0]]
+  end
+
+  it 'is able to find LCS with two common elements' do
+    a = [1, 3, 5, 7]
+    b = [2, 3, 7, 5]
+
+    lcs = described_class.lcs(a, b)
+    lcs.should == [[1, 1], [2, 3]]
+  end
+
+  it 'is able to find LCS with two close elements' do
+    a = [1, 3.05, 5, 7]
+    b = [2, 3.06, 7, 5]
+
+    lcs = described_class.lcs(a, b, numeric_tolerance: 0.1)
+    lcs.should == [[1, 1], [2, 3]]
+  end
+
+  it 'is able to find LCS with two common elements in different ordering' do
+    a = [1, 3, 4, 7]
+    b = [2, 3, 7, 5]
+
+    lcs = described_class.lcs(a, b)
+    lcs.should == [[1, 1], [3, 2]]
+  end
+
+  it 'is able to find LCS with a similarity value' do
+    a = [
+      { 'value' => 'New', 'onclick' => 'CreateNewDoc()' },
+      { 'value' => 'Close', 'onclick' => 'CloseDoc()' }
+    ]
+    b = [
+      { 'value' => 'New1', 'onclick' => 'CreateNewDoc()' },
+      { 'value' => 'Open', 'onclick' => 'OpenDoc()' },
+      { 'value' => 'Close', 'onclick' => 'CloseDoc()' }
+    ]
+
+    lcs = described_class.lcs(a, b, similarity: 0.5)
+    lcs.should == [[0, 0], [1, 2]]
+  end
+end

data/spec/hash_diff/linear_compare_array_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe HashDiff::LinearCompareArray do
+  it 'finds no differences between two empty arrays' do
+    difference = described_class.call([], [])
+    difference.should == []
+  end
+
+  it 'finds added items when the old array is empty' do
+    difference = described_class.call([], %i[a b])
+    difference.should == [['+', '[0]', :a], ['+', '[1]', :b]]
+  end
+
+  it 'finds removed items when the new array is empty' do
+    difference = described_class.call(%i[a b], [])
+    difference.should == [['-', '[1]', :b], ['-', '[0]', :a]]
+  end
+
+  it 'finds no differences between identical arrays' do
+    difference = described_class.call(%i[a b], %i[a b])
+    difference.should == []
+  end
+
+  it 'finds added items in an array' do
+    difference = described_class.call(%i[a d], %i[a b c d])
+    difference.should == [['+', '[1]', :b], ['+', '[2]', :c]]
+  end
+
+  it 'finds removed items in an array' do
+    difference = described_class.call(%i[a b c d e f], %i[a d f])
+    difference.should == [['-', '[4]', :e], ['-', '[2]', :c], ['-', '[1]', :b]]
+  end
+
+  it 'shows additions and deletions as changed items' do
+    difference = described_class.call(%i[a b c], %i[c b a])
+    difference.should == [['~', '[0]', :a, :c], ['~', '[2]', :c, :a]]
+  end
+
+  it 'shows changed items in a hash' do
+    difference = described_class.call([{ a: :b }], [{ a: :c }])
+    difference.should == [['~', '[0].a', :b, :c]]
+  end
+
+  it 'shows changed items and added items' do
+    difference = described_class.call([{ a: 1, b: 2 }], [{ a: 2, b: 2 }, :item])
+    difference.should == [['~', '[0].a', 1, 2], ['+', '[1]', :item]]
+  end
+end

data/spec/hash_diff/patch_spec.rb

@@ -0,0 +1,183 @@
+require 'spec_helper'
+
+describe HashDiff do
+  it 'is able to patch key addition' do
+    a = { 'a' => 3, 'c' => 11, 'd' => 45, 'e' => 100, 'f' => 200 }
+    b = { 'a' => 3, 'c' => 11, 'd' => 45, 'e' => 100, 'f' => 200, 'g' => 300 }
+    diff = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 3, 'c' => 11, 'd' => 45, 'e' => 100, 'f' => 200 }
+    b = { 'a' => 3, 'c' => 11, 'd' => 45, 'e' => 100, 'f' => 200, 'g' => 300 }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch value type changes' do
+    a = { 'a' => 3 }
+    b = { 'a' => { 'a1' => 1, 'a2' => 2 } }
+    diff = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 3 }
+    b = { 'a' => { 'a1' => 1, 'a2' => 2 } }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch value array <=> []' do
+    a = { 'a' => 1, 'b' => [1, 2] }
+    b = { 'a' => 1, 'b' => [] }
+    diff = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, 'b' => [1, 2] }
+    b = { 'a' => 1, 'b' => [] }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch value array <=> nil' do
+    a = { 'a' => 1, 'b' => [1, 2] }
+    b = { 'a' => 1, 'b' => nil }
+    diff = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, 'b' => [1, 2] }
+    b = { 'a' => 1, 'b' => nil }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch array value removal' do
+    a = { 'a' => 1, 'b' => [1, 2] }
+    b = { 'a' => 1 }
+    diff = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, 'b' => [1, 2] }
+    b = { 'a' => 1 }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is 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 = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, 'b-b' => [1, 2] }
+    b = { 'a' => 1, 'b-b' => [2, 1] }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch hash value removal' do
+    a = { 'a' => 1, 'b' => { 'b1' => 1, 'b2' => 2 } }
+    b = { 'a' => 1 }
+    diff = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, 'b' => { 'b1' => 1, 'b2' => 2 } }
+    b = { 'a' => 1 }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch value hash <=> {}' do
+    a = { 'a' => 1, 'b' => { 'b1' => 1, 'b2' => 2 } }
+    b = { 'a' => 1, 'b' => {} }
+    diff = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, 'b' => { 'b1' => 1, 'b2' => 2 } }
+    b = { 'a' => 1, 'b' => {} }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch value hash <=> nil' do
+    a = { 'a' => 1, 'b' => { 'b1' => 1, 'b2' => 2 } }
+    b = { 'a' => 1, 'b' => nil }
+    diff = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, 'b' => { 'b1' => 1, 'b2' => 2 } }
+    b = { 'a' => 1, 'b' => nil }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch value nil removal' do
+    a = { 'a' => 1, 'b' => nil }
+    b = { 'a' => 1 }
+    diff = described_class.diff(a, b)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, 'b' => nil }
+    b = { 'a' => 1 }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch similar objects between arrays' do
+    a = [{ 'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5 }, 3]
+    b = [1, { 'a' => 1, 'b' => 2, 'c' => 3, 'e' => 5 }]
+
+    diff = described_class.diff(a, b)
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = [{ 'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5 }, 3]
+    b = [1, { 'a' => 1, 'b' => 2, 'c' => 3, 'e' => 5 }]
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to patch similar & equal objects between arrays' do
+    a = [{ 'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5 }, { 'x' => 5, 'y' => 6, 'z' => 3 }, 1]
+    b = [1, { 'a' => 1, 'b' => 2, 'c' => 3, 'e' => 5 }]
+
+    diff = described_class.diff(a, b)
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = [{ 'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5 }, { 'x' => 5, 'y' => 6, 'z' => 3 }, 1]
+    b = [1, { 'a' => 1, 'b' => 2, 'c' => 3, 'e' => 5 }]
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is 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 = described_class.diff(a, b, delimiter: "\n")
+
+    expect(described_class.patch!(a, diff, delimiter: "\n")).to eq(b)
+
+    a = { 'a' => 1, 'b' => { 'b1' => 1, 'b2' => 2 } }
+    b = { 'a' => 1, 'b' => { 'b1' => 3 } }
+    described_class.unpatch!(b, diff, delimiter: "\n").should == a
+  end
+
+  it 'is able to patch when the diff is generated with an array_path' do
+    a = { 'a' => 1, 'b' => 1 }
+    b = { 'a' => 1, 'b' => 2 }
+    diff = described_class.diff(a, b, array_path: true)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, 'b' => 1 }
+    b = { 'a' => 1, 'b' => 2 }
+    described_class.unpatch!(b, diff).should == a
+  end
+
+  it 'is able to use non string keys when diff is generated with an array_path' do
+    a = { 'a' => 1, :a => 2, 0 => 3 }
+    b = { 'a' => 5, :a => 6, 0 => 7 }
+    diff = described_class.diff(a, b, array_path: true)
+
+    expect(described_class.patch!(a, diff)).to eq(b)
+
+    a = { 'a' => 1, :a => 2, 0 => 3 }
+    b = { 'a' => 5, :a => 6, 0 => 7 }
+    described_class.unpatch!(b, diff).should == a
+  end
+end

data/spec/hash_diff/util_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe HashDiff do
+  it 'is able to decode property path' do
+    decoded = described_class.send(:decode_property_path, 'a.b[0].c.city[5]')
+    decoded.should == ['a', 'b', 0, 'c', 'city', 5]
+  end
+
+  it 'is able to decode property path with custom delimiter' do
+    decoded = described_class.send(:decode_property_path, "a\tb[0]\tc\tcity[5]", "\t")
+    decoded.should == ['a', 'b', 0, 'c', 'city', 5]
+  end
+
+  it 'is 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 }
+    described_class.similar?(a, b).should be true
+    described_class.similar?(a, b, similarity: 1).should be false
+  end
+
+  it 'is 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 }
+    described_class.similar?(a, b, numeric_tolerance: 0.05).should be true
+    described_class.similar?(a, b).should be false
+  end
+
+  it 'is able to tell numbers and strings' do
+    described_class.similar?(1, 2).should be false
+    described_class.similar?('a', 'b').should be false
+    described_class.similar?('a', [1, 2, 3]).should be false
+    described_class.similar?(1, 'a' => 1, 'b' => 2, 'c' => 3, 'e' => 5).should be false
+  end
+
+  it 'is able to tell true when similarity == 0.5' do
+    a = { 'value' => 'New1', 'onclick' => 'CreateNewDoc()' }
+    b = { 'value' => 'New', 'onclick' => 'CreateNewDoc()' }
+
+    described_class.similar?(a, b, similarity: 0.5).should be true
+  end
+
+  it 'is able to tell false when similarity == 0.5' do
+    a = { 'value' => 'New1', 'onclick' => 'open()' }
+    b = { 'value' => 'New', 'onclick' => 'CreateNewDoc()' }
+
+    described_class.similar?(a, b, similarity: 0.5).should be false
+  end
+
+  describe '.compare_values' do
+    it 'compares numeric values exactly when no tolerance' do
+      expect(described_class.compare_values(10.004, 10.003)).to be false
+    end
+
+    it 'allows tolerance with numeric values' do
+      expect(described_class.compare_values(10.004, 10.003, numeric_tolerance: 0.01)).to be true
+    end
+
+    it 'compares different objects without tolerance' do
+      expect(described_class.compare_values('hats', 'ninjas')).to be false
+    end
+    it 'compares other objects with tolerance' do
+      expect(described_class.compare_values('hats', 'ninjas', numeric_tolerance: 0.01)).to be false
+    end
+
+    it 'compares same objects without tolerance' do
+      expect(described_class.compare_values('horse', 'horse')).to be true
+    end
+
+    it 'compares strings for spaces exactly by default' do
+      expect(described_class.compare_values(' horse', 'horse')).to be false
+    end
+
+    it 'compares strings for capitalization exactly by default' do
+      expect(described_class.compare_values('horse', 'Horse')).to be false
+    end
+
+    it 'strips strings before comparing when requested' do
+      expect(described_class.compare_values(' horse', 'horse', strip: true)).to be true
+    end
+
+    it 'ignores string case when requested' do
+      expect(described_class.compare_values('horse', 'Horse', case_insensitive: true)).to be true
+    end
+  end
+end

metadata

@@ -1,69 +1,98 @@
 --- !ruby/object:Gem::Specification
 name: hashdiff
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Liu Fengyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
+- !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'
 - !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
+  name: rubocop
   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
+  name: rubocop-rspec
+  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: 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'
-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"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.md
@@ -77,13 +106,13 @@ files:
 - lib/hashdiff/patch.rb
 - lib/hashdiff/util.rb
 - lib/hashdiff/version.rb
-- spec/hashdiff/best_diff_spec.rb
-- spec/hashdiff/diff_array_spec.rb
-- spec/hashdiff/diff_spec.rb
-- spec/hashdiff/lcs_spec.rb
-- spec/hashdiff/linear_compare_array_spec.rb
-- spec/hashdiff/patch_spec.rb
-- spec/hashdiff/util_spec.rb
+- spec/hash_diff/best_diff_spec.rb
+- spec/hash_diff/diff_array_spec.rb
+- spec/hash_diff/diff_spec.rb
+- spec/hash_diff/lcs_spec.rb
+- spec/hash_diff/linear_compare_array_spec.rb
+- spec/hash_diff/patch_spec.rb
+- spec/hash_diff/util_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/liufengyun/hashdiff
 licenses:
@@ -95,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: HashDiff is a diff lib to compute the smallest difference between two hashes.