hash_deep_diff 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f27828ee0fbf8a3d07505ed475c3117d2734dd9505e57e3e12d0a360eab4df08
-  data.tar.gz: b23a5ef94237454e5a50cac7a59e1624a3d8e6f29d249c6d5836ddd596fe097c
+  metadata.gz: fe3724394c10b36b7537f35bce5c7f079cae0ee3344062a78bdfe7256363624b
+  data.tar.gz: e9baa112b03013b91f75ebea9f243a0a6d51ca746ca8c8e66ea6fa38803198fd
 SHA512:
-  metadata.gz: e83d2e0c8e2843f084aa82ea3e246659b6e078a7c3183f03c236bea8e4ac7848d39ed18bc2f81dfa4aecc005af4149372b5d2da28d87760ee4ff1c330f67f54a
-  data.tar.gz: b56714d24122c5cf9ab11616257cb75a2c2c4cb17225f2b0ad8665cbb64c1b49a6fb0d0f544a6961d5db236ef2e8896ebed8fa0d461479be24629cf6d2ecbf71
+  metadata.gz: b7393bb437eddfb8e0ed66d4eba3b4135e221c7c2262df14aa4509dba98345c4766b598bd3c3f11f311c84b25b4f9f0b2bca3dfc5083c023c87c582fa607761a
+  data.tar.gz: 57708513050ac1e63c0ce64b9650e0ae0e3128127cbb4dfc5b248cc3caca3267cbd26bed7b939be4413c11f1a7038f5503aef143119a09e336cc113324ae182a

data/README.md

@@ -1,8 +1,6 @@
 # HashDeepDiff
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/hash_deep_diff`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Find the exact difference between two Hash objects and build a report to visualize it
 
 ## Installation
 
@@ -21,15 +19,20 @@ Or install it yourself as:
     $ gem install hash_deep_diff
 
 ## Usage
+Basic example
 
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+```ruby
+left = { a: :a }
+right = { a: :b }
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+HashDeepDiff::Comparison.new(left, right).report
+```
+```diff
+- left[a] = a
++ right[a] = b 
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/hash_deep_diff.
+Bug reports and pull requests are welcome on GitHub at [bpohoriletz](https://github.com/bpohoriletz/hash_deep_diff).
+	

data/lib/hash_deep_diff/comparison.rb

@@ -26,53 +26,22 @@ 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.each_with_object([]) do |key, memo|
-        memo << Delta::Right.new(path: path + [key], value: right[key])
-      end
+      right_diff_keys.map { |key| Delta::Right.new(path: path + [key], value: right[key]) }
     end
 
     def delta(&block)
@@ -88,12 +57,6 @@ module HashDeepDiff
       end
     end
 
-    def left_delta
-      left_diff_keys.each_with_object([]) do |key, memo|
-        memo << Delta::Left.new(path: path + [key], value: left[key])
-      end
-    end
-
     def common_keys
       left.keys & right.keys
     end

data/lib/hash_deep_diff/delta/acts_as_delta.rb

@@ -23,6 +23,7 @@ module HashDeepDiff
         end
 
         # TOFIX poor naming
+        # overrides parameter in initializer
         def path
           @prefix + [@delta.keys.first]
         end
@@ -42,6 +43,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
@@ -50,9 +55,11 @@ module HashDeepDiff
           # TOFIX this may prohibit usage of hashes with Array keys
           if path.respond_to?(:to_ary)
             @delta = { path[-1] => value }
+            @value = value
             @prefix = path[0..-2]
           else
             @delta = { path => value }
+            @value = value
             @prefix = []
           end
         end

data/lib/hash_deep_diff/delta/inner.rb

@@ -11,33 +11,29 @@ module HashDeepDiff
       include Delta::ActsAsDelta
 
       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
-            else
-              lines = <<~Q
-                -left#{diff_prefix} = #{@delta.values.first[:left]}
-                +right#{diff_prefix} = #{@delta.values.first[:right]}
-              Q
-              lines.strip
-            end
-          else
-            @delta.values.first.keys.map do |key|
-              self.class.new(path: path + [key], value: @delta.values.first[key])
-            end.join("\n").strip
-          end
-        else
-          lines = <<~Q
-            -left#{diff_prefix} = #{@delta.values.first[:left]}
-            +right#{diff_prefix} = #{@delta.values.first[:right]}
-          Q
-          lines.strip
-        end
+        return diff unless complex?
+
+        HashDeepDiff::Comparison.new(left, right, path).report
+      end
+
+      def diff
+        lines = <<~Q
+          -left#{diff_prefix} = #{left}
+          +right#{diff_prefix} = #{right}
+        Q
+        lines.strip
+      end
+
+      def complex?
+        left.respond_to?(:to_hash) && right.respond_to?(:to_hash)
+      end
+
+      def left
+        @value[:left]
+      end
+
+      def right
+        @value[:right]
       end
     end
   end

data/lib/hash_deep_diff/delta/left.rb

@@ -11,13 +11,19 @@ module HashDeepDiff
       include Delta::ActsAsDelta
 
       def to_str
-        if @delta.values.first.respond_to?(:to_hash)
-          @delta.values.first.keys.map do |key|
-            self.class.new(path: path + [key], value: @delta.values.first[key])
-          end.join("\n").strip
-        else
-          "+left#{diff_prefix} = #{@delta.values.first}"
-        end
+        return "+left#{diff_prefix} = #{left}" unless left.respond_to?(:to_hash)
+
+        left.keys.map do |key|
+          self.class.new(path: path + [key], value: left[key])
+        end.join("\n").strip
+      end
+
+      def left
+        @value
+      end
+
+      def right
+        nil
       end
     end
   end

data/lib/hash_deep_diff/delta/right.rb

@@ -11,13 +11,19 @@ module HashDeepDiff
       include Delta::ActsAsDelta
 
       def to_str
-        if @delta.values.first.respond_to?(:to_hash)
-          @delta.values.first.keys.map do |key|
-            self.class.new(path: path + [key], value: @delta.values.first[key])
-          end.join("\n").strip
-        else
-          "-left#{diff_prefix} = #{@delta.values.first}"
-        end
+        return "-left#{diff_prefix} = #{right}" unless right.respond_to?(:to_hash)
+
+        right.keys.map do |key|
+          self.class.new(path: path + [key], value: right[key])
+        end.join("\n").strip
+      end
+
+      def left
+        nil
+      end
+
+      def right
+        @value
       end
     end
   end

data/lib/hash_deep_diff/version.rb

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

metadata

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