canon 0.3.120 → 0.3.122

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38a359346723b741f1bc368f5bb563f816a6cce60645fd4329c6a615175492d9
-  data.tar.gz: f02379429df3da9c8ad8835eeba4ccafb423d4b00e7a0b65ba6dac8acc488aa6
+  metadata.gz: 5c8f274f503852b87469eb653b74b16cff4a24313a642ba665f9d00f4ddc5ca2
+  data.tar.gz: 1ff259b65b606b03400e5c729ba2384643877a48fdca3e7ff12f6ba5adfae62d
 SHA512:
-  metadata.gz: 90794b21762de80ba03846c814a5980da475d156efbb63b6248e76956967408988341145abbec476f253f8113524c87367c343366a875d0eb50008b5b48497f7
-  data.tar.gz: f26fdd27f3f203dc0da8a612bb421889fee7c2d1823a2c6ccb29aad10dc0dca8876906c7438739296d1db6baac6111a1363ae9f7f0e8a131e42adbe2c06958c4
+  metadata.gz: 936d7dd4ca541dc44435294f26ac3f04886668ccfd5c919ef6cd50c033b75d633e33e4fcdbe9cdd809e9400f2c882af7baaf00d1316e6c832b46a87a8c0e6ec7
+  data.tar.gz: ae0c2379e7aefd1445bd108aa6533c8570858418e02e35653339618d597bfedab7254af12955a5cd7c8717e29a93591bfd458f6b3920fc343cf8af0a8189b0f8

data/lib/canon/comparison.rb

@@ -637,6 +637,22 @@ module Canon
         resolved = opts.dup
         format_hint = resolved[:format]
 
+        # Arrays have no document format of their own: suites extract
+        # value lists (attributes, anchors) or node lists and compare
+        # them as arrays. Element-wise, order-sensitive, each element
+        # recursing through the normal pipeline (strings short-circuit,
+        # nodes take their own format path).
+        if obj1.is_a?(Array) && obj2.is_a?(Array)
+          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
@@ -690,6 +706,73 @@ 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: 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 = []
+        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?(value_before, value_after, scalar_opts)
+               end
+          next if eq == true
+
+          return false unless verbose
+
+          diffs << leaf_diff(key.to_s, value_before, value_after)
+        end
+        verbose ? diffs : diffs.empty?
+      end
+
       def normalize_comparison_format(format1, format2)
         return format2 if format1 == :ruby_object &&
           %i[json yaml].include?(format2)

data/lib/canon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canon
 version: !ruby/object:Gem::Version
-  version: 0.3.120
+  version: 0.3.122
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-11-02 00:00:00.000000000 Z
+date: 2026-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs