canon 0.3.121 → 0.3.122

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0a5d94e934c12df80540761d13587ddf9adabad10db384f7bfad3b640affbf
-  data.tar.gz: 27ad206ee9f2fc7bb0c37b09948716ee46bb42fbaa2894b813feb90246823343
+  metadata.gz: 5c8f274f503852b87469eb653b74b16cff4a24313a642ba665f9d00f4ddc5ca2
+  data.tar.gz: 1ff259b65b606b03400e5c729ba2384643877a48fdca3e7ff12f6ba5adfae62d
 SHA512:
-  metadata.gz: 961d3fda5a67a3219e7fad26f5d90cf52ad691e7e625d8f831d29d29cd81593147617cef7dbe17073ecf7d1ad279af0ea941f2d20a88652857e90f373bd6bdec
-  data.tar.gz: 99f8e9910736ee42355ccd4a7350d9ba56ed819eb1a2530ed326dd2cc2524b4ddcb50ad7a3e87972279d962637ab2b04d65f79afcfb8b99562ad4697a1e01325
+  metadata.gz: 936d7dd4ca541dc44435294f26ac3f04886668ccfd5c919ef6cd50c033b75d633e33e4fcdbe9cdd809e9400f2c882af7baaf00d1316e6c832b46a87a8c0e6ec7
+  data.tar.gz: ae0c2379e7aefd1445bd108aa6533c8570858418e02e35653339618d597bfedab7254af12955a5cd7c8717e29a93591bfd458f6b3920fc343cf8af0a8189b0f8

data/lib/canon/comparison.rb

@@ -646,6 +646,13 @@ module Canon
           return array_diff(obj1, obj2, resolved)
         end
 
+        # Hashes (metadata dumps the equivalent-xml matcher compared
+        # generically): key-wise deep comparison through the normal
+        # pipeline.
+        if obj1.is_a?(Hash) && obj2.is_a?(Hash)
+          return hash_diff(obj1, obj2, resolved)
+        end
+
         # Detect formats (with explicit hint) and pre-parse HTML strings
         # through Nokogiri::HTML5 so html4 and html5 share HTML's
         # whitespace-sensitivity semantics (issue #118).  Pre-parsing
@@ -699,29 +706,69 @@ module Canon
       # @param format1 [Symbol]
       # @param format2 [Symbol]
       # @return [Symbol]
+      SCALAR_LEAVES = [String, Symbol, Numeric, NilClass,
+                       TrueClass, FalseClass].freeze
+
+      def scalar_leaf?(obj)
+        SCALAR_LEAVES.any? { |k| obj.is_a?(k) }
+      end
+
       def array_diff(arr1, arr2, opts = {})
         verbose = opts[:verbose]
         if arr1.size != arr2.size
           return verbose ? [:size_mismatch] : false
         end
 
-        # Elements are extracted values, not documents: strings compare
-        # literally (a matcher format hint must not turn "ref1" into an
-        # XML fragment, where every bare string parses equal), and the
-        # format hint is dropped for the recursion on other scalars.
+        # Elements are extracted values, not documents: scalar leaves
+        # compare literally (a matcher format hint must not turn "ref1"
+        # into an XML fragment, where every bare string parses equal,
+        # and the detector has no format for numbers at all); containers
+        # and nodes recurse through the normal pipeline without the
+        # format hint.
+        scalar_opts = opts.except(:verbose, :format)
+        diffs = []
+        arr1.zip(arr2).each_with_index do |(element_before, element_after), i|
+          eq = if scalar_leaf?(element_before) && scalar_leaf?(element_after)
+                 element_before == element_after
+               else
+                 equivalent?(element_before, element_after, scalar_opts)
+               end
+          next if eq == true
+
+          return false unless verbose
+
+          diffs << leaf_diff(i.to_s, element_before, element_after)
+        end
+        verbose ? diffs : diffs.empty?
+      end
+
+      # Verbose ruby-object entries use the diff-code shape the
+      # DiffFormatter's by-object renderers consume.
+      def leaf_diff(path, value_before, value_after)
+        { path: path, diff_code: UNEQUAL_PRIMITIVES,
+          value1: value_before, value2: value_after }
+      end
+
+      def hash_diff(hash1, hash2, opts = {})
+        verbose = opts[:verbose]
+        if hash1.keys.sort != hash2.keys.sort
+          return verbose ? [:key_mismatch] : false
+        end
+
         scalar_opts = opts.except(:verbose, :format)
         diffs = []
-        arr1.zip(arr2).each_with_index do |(a, b), i|
-          eq = if a.is_a?(String) && b.is_a?(String)
-                 a == b
+        hash1.each do |key, value_before|
+          value_after = hash2[key]
+          eq = if scalar_leaf?(value_before) && scalar_leaf?(value_after)
+                 value_before == value_after
                else
-                 equivalent?(a, b, scalar_opts)
+                 equivalent?(value_before, value_after, scalar_opts)
                end
           next if eq == true
 
           return false unless verbose
 
-          diffs << { index: i, difference: eq == false ? :different : eq }
+          diffs << leaf_diff(key.to_s, value_before, value_after)
         end
         verbose ? diffs : diffs.empty?
       end

data/lib/canon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canon
-  VERSION = "0.3.121"
+  VERSION = "0.3.122"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canon
 version: !ruby/object:Gem::Version
-  version: 0.3.121
+  version: 0.3.122
 platform: ruby
 authors:
 - Ribose Inc.