hash_diff 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 138f8fc905ed5caa8160dc05131bfd1d1f484908
-  data.tar.gz: 7bc15e4a8d6e0fa94bd1c4bc0f29d67e34ad7dc1
+  metadata.gz: e02ff6f11b18eafa65d02ecd98cccf8a789d8cda
+  data.tar.gz: 70710b0568a977b1e4a4c4423a1e048a4cd76acc
 SHA512:
-  metadata.gz: 702c7c4b34e50a6b410ed191a57e185a55ba96d3ca95c855b68f349fc267f1204ab00bd439fa248d23ab22a456aff5a84c0fac04356004017a7d6ce77076e50d
-  data.tar.gz: 14211e477a53d725526d6f7c271338a49727d81bafa447842cef00ded7e561184f590478294a1b7a19f868c122e2c60f8e4dd1969e7cc470f78cd6d96477f282
+  metadata.gz: 17ff9470571e175b9ea761f8cbd3e0d1bfa06f26d56d08e006dfa877ec3ddc9a4f95355f59b256c3ce43dc4c32f54b0a7a6d3d58a481d39b79df08e2e963b57d
+  data.tar.gz: 9451787251c0d041a7d2b014c86bad7bbae3d442fd4bd0ddb9d968996246ca27ac747f61f96c19af66d8fcc99f9774c04b891d80383fc2ff23e54c0bd4b5ee0d

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task default: :spec
+rescue LoadError
+end

data/lib/hash_diff.rb

@@ -2,25 +2,25 @@ require "hash_diff/version"
 require "hash_diff/comparison"
 
 module HashDiff
-  class << self
-    def diff(*args)
-      Comparison.new(*args).diff
-    end
+  def self.patch!
+    Hash.class_eval do
+      def diff(right)
+        HashDiff.left_diff(self, right)
+      end
+    end unless Hash.new.respond_to?(:diff)
+  end
+
+  module_function
 
-    def left_diff(*args)
-      Comparison.new(*args).left_diff
-    end
+  def diff(*args)
+    Comparison.new(*args).diff
+  end
 
-    def right_diff(*args)
-      Comparison.new(*args).right_diff
-    end
+  def left_diff(*args)
+    Comparison.new(*args).left_diff
+  end
 
-    def patch!
-      Hash.class_eval do
-        def diff right
-          HashDiff.left_diff self, right
-        end
-      end unless self.class.respond_to? :diff
-    end
+  def right_diff(*args)
+    Comparison.new(*args).right_diff
   end
 end

data/lib/hash_diff/comparison.rb

@@ -1,45 +1,39 @@
 module HashDiff
-  class Comparison < Struct.new(:left, :right)
-  
+  class Comparison
+    def initialize(left, right)
+      @left  = left
+      @right = right
+    end
+
+    attr_reader :left, :right
+
     def diff
-      @diff ||= differences(left, right)
+      @diff ||= find_differences { |l, r| [l, r] }
     end
 
     def left_diff
-      @concern = :left
-      @left_diff ||= differences(left, right)
+      @left_diff ||= find_differences { |_, r| r }
     end
 
     def right_diff
-      @concern = :right
-      @right_diff ||= differences(left, right)
+      @right_diff ||= find_differences { |l, _| l }
     end
 
-    private
-
-    def concern
-      @concern ||= :both
-    end
+    protected
 
-    def clone(left, right)
-      self.dup.tap do |inst|
-        inst.left  = left
-        inst.right = right
-      end
+    def find_differences(&reporter)
+      combined_keys.each_with_object({ }, &comparison_strategy(reporter))
     end
 
-    def differences(left, right)
-      combined_attribute_keys.reduce({}, &reduction_strategy)
-    end
+    private
 
-    def reduction_strategy
-      lambda do |diff, key|
-        diff[key] = report(key) if not equal?(key)
-        diff
+    def comparison_strategy(reporter)
+      lambda do |key, diff|
+        diff[key] = report_difference(key, reporter) unless equal?(key)
       end
     end
 
-    def combined_attribute_keys
+    def combined_keys
       (left.keys + right.keys).uniq
     end
 
@@ -48,26 +42,18 @@ module HashDiff
     end
 
     def hash?(value)
-      value.is_a? Hash
+      value.is_a?(Hash)
     end
 
     def comparable?(key)
-      hash?(left[key]) and hash?(right[key])
+      hash?(left[key]) && hash?(right[key])
     end
 
-    def report(key)
+    def report_difference(key, reporter)
       if comparable?(key)
-        clone(left[key], right[key]).diff
+        self.class.new(left[key], right[key]).find_differences(&reporter)
       else
-        report_concern(key)
-      end
-    end
-
-    def report_concern(key)
-      case concern
-      when :left  then right[key]
-      when :right then left[key]
-      when :both  then [left[key], right[key]]
+        reporter.call(left[key], right[key])
       end
     end
   end

data/lib/hash_diff/version.rb

@@ -1,3 +1,3 @@
 module HashDiff
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rspec'
-require 'rspec/autorun'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
 $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
@@ -9,4 +8,4 @@ require 'hash_diff'
 
 RSpec.configure do |c|
   c.filter_run_excluding :skip_on_windows => !(RbConfig::CONFIG['host_os'] =~ /mingw32/).nil?
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_diff
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Coding Zeal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler