hashdiff 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 482b0233e91f747074eada75539247148a14d31d
-  data.tar.gz: 0aba247c54a9e96d433d77ecc76b3e4cf1396075
+  metadata.gz: 1de380f239260b12890d36de1548ee8a9159a15d
+  data.tar.gz: be13f7000b31ac211e59c8e5c924a976a39fb26c
 SHA512:
-  metadata.gz: 10fe5b5b37c1a80d317d509b133a880211723ff4b184e892678eb7211de5bcf41b27d482151237052efabd6c9eee336507d5df4f19e2b0e727de970e47280cb4
-  data.tar.gz: 22baf87f78115a872a6df5600b8a31c2d8e3c35991ca114aff60a89af70d29b530f3771386d8bb67578324884f30291e120ed418f78c2768baa746e456f65d71
+  metadata.gz: bad33e3fd08a4f7b14388f54c17060153a48832eda6c06e6d137ce23b901cd14183630eabcfa7e1da6d2c93f33d7b59109a7fee0e78a23f2a3102e3576c35846
+  data.tar.gz: 7fa406149636c91d9cc5abc49b926f92e8b4962654e9b78ef18b3938dc971ce2f51cf16b2c01b3968556cc20fbfb577437b76a7094ecf0ba4eb5cd00cdba0bb3

data/.rubocop.yml

@@ -17,5 +17,8 @@ Metrics/ModuleLength:
   Enabled: false
 Style/Documentation:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
 RSpec/ExampleLength:
   Enabled: false

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 gemspec
 

data/README.md

@@ -8,6 +8,9 @@ HashDiff does not monkey-patch any existing class. All features are contained in
 
 **Docs**: [Documentation](http://rubydoc.info/gems/hashdiff)
 
+
+__WARNING__: Don't use the library for comparing large arrays, say ~10K (see #49).
+
 ## Why HashDiff?
 
 Given two Hashes A and B, sometimes you face the question: what's the smallest modification that can be made to change A into B?
@@ -262,4 +265,3 @@ HashDiff.diff(a, b) => []
 ## License
 
 HashDiff is distributed under the MIT-LICENSE.
-

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 require 'rubocop/rake_task'

data/changelog.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.3.9 2019-04-22
+
+* Performance tweak (thanks @krzysiek1507: #51 #52 #53)
+
 ## v0.3.8 2018-12-30
 
 * Add Rubocop and drops Ruby 1.9 support #47
@@ -73,4 +77,3 @@ For example, `diff({a:2, c:[4, 5]}, {a:2}) will generate following output:
 instead of following:
 
     [['-', 'c[0]', 4], ['-', 'c[1]', 5], ['-', 'c', []]]
-

data/hashdiff.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH << File.expand_path('lib', __dir__)
 require 'hashdiff/version'
 
@@ -12,7 +14,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- Appraisals {spec}/*`.split("\n")
 
   s.require_paths = ['lib']
-  s.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
+  s.required_ruby_version = Gem::Requirement.new('>= 2.0.0')
 
   s.authors = ['Liu Fengyun']
   s.email   = ['liufengyunchina@gmail.com']

data/lib/hashdiff.rb

@@ -1,6 +1,8 @@
-require 'hashdiff/util'
-require 'hashdiff/lcs'
-require 'hashdiff/linear_compare_array'
-require 'hashdiff/diff'
-require 'hashdiff/patch'
-require 'hashdiff/version'
+# frozen_string_literal: true
+
+require_relative 'hashdiff/util'
+require_relative 'hashdiff/lcs'
+require_relative 'hashdiff/linear_compare_array'
+require_relative 'hashdiff/diff'
+require_relative 'hashdiff/patch'
+require_relative 'hashdiff/version'

data/lib/hashdiff/diff.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HashDiff
   # Best diff two objects, which tries to generate the smallest change set using different similarity values.
   #
@@ -120,13 +122,15 @@ module HashDiff
     elsif obj1.is_a?(Array) && !opts[:use_lcs]
       result.concat(LinearCompareArray.call(obj1, obj2, opts))
     elsif obj1.is_a?(Hash)
+      obj1_keys = obj1.keys
+      obj2_keys = obj2.keys
 
-      deleted_keys = obj1.keys - obj2.keys
-      common_keys = obj1.keys & obj2.keys
-      added_keys = obj2.keys - obj1.keys
+      deleted_keys = (obj1_keys - obj2_keys).sort_by(&:to_s)
+      common_keys = (obj1_keys & obj2_keys).sort_by(&:to_s)
+      added_keys = (obj2_keys - obj1_keys).sort_by(&:to_s)
 
       # add deleted properties
-      deleted_keys.sort_by { |k, _v| k.to_s }.each do |k|
+      deleted_keys.each do |k|
         change_key = prefix_append_key(opts[:prefix], k, opts)
         custom_result = custom_compare(opts[:comparison], change_key, obj1[k], nil)
 
@@ -138,13 +142,13 @@ module HashDiff
       end
 
       # recursive comparison for common keys
-      common_keys.sort_by { |k, _v| k.to_s }.each do |k|
+      common_keys.each do |k|
         prefix = prefix_append_key(opts[:prefix], k, opts)
         result.concat(diff(obj1[k], obj2[k], opts.merge(prefix: prefix)))
       end
 
       # added properties
-      added_keys.sort_by { |k, _v| k.to_s }.each do |k|
+      added_keys.each do |k|
         change_key = prefix_append_key(opts[:prefix], k, opts)
         next if obj1.key?(k)
 
@@ -169,28 +173,33 @@ module HashDiff
   #
   # diff array using LCS algorithm
   def self.diff_array_lcs(arraya, arrayb, options = {})
-    opts = {
-      prefix: '',
-      similarity: 0.8,
-      delimiter: '.'
-    }.merge!(options)
+    return [] if arraya.empty? && arrayb.empty?
 
     change_set = []
-    return [] if arraya.empty? && arrayb.empty?
 
     if arraya.empty?
       arrayb.each_index do |index|
         change_set << ['+', index, arrayb[index]]
       end
+
       return change_set
-    elsif arrayb.empty?
+    end
+
+    if arrayb.empty?
       arraya.each_index do |index|
         i = arraya.size - index - 1
         change_set << ['-', i, arraya[i]]
       end
+
       return change_set
     end
 
+    opts = {
+      prefix: '',
+      similarity: 0.8,
+      delimiter: '.'
+    }.merge!(options)
+
     links = lcs(arraya, arrayb, opts)
 
     # yield common

data/lib/hashdiff/lcs.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module HashDiff
   # @private
   #
   # caculate array difference using LCS algorithm
   # http://en.wikipedia.org/wiki/Longest_common_subsequence_problem
   def self.lcs(arraya, arrayb, options = {})
+    return [] if arraya.empty? || arrayb.empty?
+
     opts = { similarity: 0.8 }.merge!(options)
 
     opts[:prefix] = prefix_append_array_index(opts[:prefix], '*', opts)
 
-    return [] if arraya.empty? || arrayb.empty?
-
     a_start = b_start = 0
     a_finish = arraya.size - 1
     b_finish = arrayb.size - 1

data/lib/hashdiff/linear_compare_array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HashDiff
   # @private
   #

data/lib/hashdiff/patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # This module provides methods to diff two hash, patch and unpatch hash
 #

data/lib/hashdiff/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HashDiff
   # @private
   #
@@ -5,14 +7,15 @@ module HashDiff
   def self.similar?(obja, objb, options = {})
     return compare_values(obja, objb, options) unless obja.is_a?(Array) || obja.is_a?(Hash) || objb.is_a?(Array) || objb.is_a?(Hash)
 
-    opts = { similarity: 0.8 }.merge(options)
-
     count_a = count_nodes(obja)
     count_b = count_nodes(objb)
-    diffs = count_diff diff(obja, objb, opts)
 
     return true if (count_a + count_b).zero?
 
+    opts = { similarity: 0.8 }.merge!(options)
+
+    diffs = count_diff diff(obja, objb, opts)
+
     (1 - diffs.to_f / (count_a + count_b).to_f) >= opts[:similarity]
   end
 
@@ -81,8 +84,8 @@ module HashDiff
   #
   # check for equality or "closeness" within given tolerance
   def self.compare_values(obj1, obj2, options = {})
-    if (options[:numeric_tolerance].is_a? Numeric) &&
-       [obj1, obj2].all? { |v| v.is_a? Numeric }
+    if options[:numeric_tolerance].is_a?(Numeric) &&
+       obj1.is_a?(Numeric) && obj2.is_a?(Numeric)
       return (obj1 - obj2).abs <= options[:numeric_tolerance]
     end
 
@@ -103,9 +106,7 @@ module HashDiff
   #
   # check if objects are comparable
   def self.comparable?(obj1, obj2, strict = true)
-    [Array, Hash].each do |type|
-      return true if obj1.is_a?(type) && obj2.is_a?(type)
-    end
+    return true if (obj1.is_a?(Array) || obj1.is_a?(Hash)) && obj2.is_a?(obj1.class)
     return true if !strict && obj1.is_a?(Numeric) && obj2.is_a?(Numeric)
 
     obj1.is_a?(obj2.class) && obj2.is_a?(obj1.class)

data/lib/hashdiff/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HashDiff
-  VERSION = '0.3.8'.freeze
+  VERSION = '0.3.9'.freeze
 end

data/spec/hash_diff/best_diff_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HashDiff do

data/spec/hash_diff/diff_array_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HashDiff do

data/spec/hash_diff/diff_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HashDiff do

data/spec/hash_diff/lcs_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HashDiff do

data/spec/hash_diff/linear_compare_array_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HashDiff::LinearCompareArray do

data/spec/hash_diff/patch_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HashDiff do

data/spec/hash_diff/util_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HashDiff do
@@ -18,6 +20,14 @@ describe HashDiff do
     described_class.similar?(a, b, similarity: 1).should be false
   end
 
+  it 'is able to tell similiar empty hash' do
+    described_class.similar?({}, {}, 1).should be true
+  end
+
+  it 'is able to tell similiar empty array' do
+    described_class.similar?([], [], 1).should be true
+  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 }

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashdiff
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Liu Fengyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bluecloth
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="