hash_deep_diff 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43343dfc0eed6ad00b863b65b535f206b6a14544c8c23560f01954e16c7ef19b
-  data.tar.gz: 613e764bf1a0390bfba99eceaa6e65e69355903858c229f8d150661c8a923af4
+  metadata.gz: 184fe8aaacd6b6d10635f8ff8f0986381c8e2d907b14a80d86050aea75896136
+  data.tar.gz: e4e33cc8c4ce40d84b0fbbe78fa380d1d62f65805f3ce5dc01e2049100db5b16
 SHA512:
-  metadata.gz: 701aad97711690dbaff2719a3c0f6a4c0bbbf2a3ffdcd088b6451803c392a019dd37dba9b3cffc3a7843862b8341d6a7e17eaa2935aba8be4f069fb81160a052
-  data.tar.gz: 920a5d22b16bb78866c752c5a60469f37af9d58f8f0f3852c1822f594223f995ed4c87f14777d3dc857a73310d1c851581edd9fdba36bc3b433d069133211d95
+  metadata.gz: b299b5217a613175c47e5d56da723e0691cf7e2344abc9bbf9fab9525c96c776616971636365f0c2067f05ec8d22c205c98d896df4b1b17ee73f3541bb4e5736
+  data.tar.gz: 159ffbeb7cdef03c130ed356f965379db05ebf8adec8b7e5186e1a45b4cbcc68489ce17b92a7e2bc38e58cdd2fafcb31c573703f566f348b0efdc0ef8c504d4e

data/lib/hash_deep_diff/comparison.rb

@@ -26,49 +26,20 @@ module HashDeepDiff
       @path = path.to_ary
     end
 
-    def extra_report(memo, keys, value)
-      if value.respond_to?(:to_hash)
-        value.each_key { |key| extra_report(memo, keys + [key], value[key]) }
-      else
-        memo << Delta::Left.new(path: keys, value: value)
-      end
-    end
-
-    def missing_report(memo, keys, value)
-      if value.respond_to?(:to_hash)
-        value.each_key { |key| missing_report(memo, keys + [key], value[key]) }
-      else
-        memo << Delta::Right.new(path: keys, value: value)
-      end
-    end
-
-    def delta_report(memo, keys, value)
-      if value.respond_to?(:to_hash) && value.keys != %i[left right]
-        value.each_key { |key| delta_report(memo, keys + [key], value[key]) }
-      elsif value.instance_of?(Array) && value.size == 3 && value.all? { |el| el.respond_to?(:to_hash) }
-        # [{}, {}, {:i=>:i}]
-        extra_report(memo, keys, value[0]) unless value[0].empty?
-        delta_report(memo, keys, value[1]) unless value[1].empty?
-        missing_report(memo, keys, value[2]) unless value[2].empty?
-      else
-        memo << Delta::Inner.new(path: keys, value: value)
-      end
-    end
-
     def deep_delta(&block)
-      result = delta(&block)
-
-      result.each_with_object([]) do |diff, memo|
-        if left.dig(*diff.path).respond_to?(:to_hash) && right.dig(*diff.path).respond_to?(:to_hash)
-          self.class.new(left.dig(*diff.path), right.dig(*diff.path), path + diff.path).diff.each do |diff|
-            memo << diff
-          end
+      delta(&block).flat_map do |diff|
+        if diff.complex?
+          self.class.new(diff.left, diff.right, diff.path).diff
         else
-          memo << diff
+          diff
         end
       end
     end
 
+    def left_delta
+      left_diff_keys.map { |key| Delta::Left.new(path: path + [key], value: left[key]) }
+    end
+
     def right_delta
       right_diff_keys.map { |key| Delta::Right.new(path: path + [key], value: right[key]) }
     end
@@ -86,10 +57,6 @@ module HashDeepDiff
       end
     end
 
-    def left_delta
-      left_diff_keys.map { |key| Delta::Left.new(path: path + [key], value: left[key]) }
-    end
-
     def common_keys
       left.keys & right.keys
     end

data/lib/hash_deep_diff/delta/acts_as_delta.rb

@@ -42,6 +42,10 @@ module HashDeepDiff
         def to_str
           raise NoMethodError, "expected #{self.class} to implement #to_str"
         end
+
+        def complex?
+          raise NoMethodError, "expected #{self.class} to implement #complex?"
+        end
       end
 
       # Override #initialize method

data/lib/hash_deep_diff/delta/inner.rb

@@ -13,16 +13,12 @@ module HashDeepDiff
       def to_str
         if @delta.values.first.respond_to?(:to_hash)
           if @delta.values.first.keys == %i[left right]
-            if @delta.values.first[:left].respond_to?(:to_hash) && @delta.values.first[:right].respond_to?(:to_hash)
-              HashDeepDiff::Comparison.new(
-                @delta.values.first[:left],
-                @delta.values.first[:right],
-                path
-              ).report
+            if complex?
+              HashDeepDiff::Comparison.new(left, right, path).report
             else
               lines = <<~Q
-                -left#{diff_prefix} = #{@delta.values.first[:left]}
-                +right#{diff_prefix} = #{@delta.values.first[:right]}
+                -left#{diff_prefix} = #{left}
+                +right#{diff_prefix} = #{right}
               Q
               lines.strip
             end
@@ -33,12 +29,24 @@ module HashDeepDiff
           end
         else
           lines = <<~Q
-            -left#{diff_prefix} = #{@delta.values.first[:left]}
-            +right#{diff_prefix} = #{@delta.values.first[:right]}
+            -left#{diff_prefix} = #{left}
+            +right#{diff_prefix} = #{right}
           Q
           lines.strip
         end
       end
+
+      def complex?
+        left.respond_to?(:to_hash) && right.respond_to?(:to_hash)
+      end
+
+      def left
+        @delta.values.first[:left]
+      end
+
+      def right
+        @delta.values.first[:right]
+      end
     end
   end
 end

data/lib/hash_deep_diff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HashDeepDiff
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_deep_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Bohdan Pohorilets
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler