canon 0.3.66 → 0.3.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a82e16556af6e2b31b4a137e5beef44d499df0d20a019f5406c9c127e94207
-  data.tar.gz: 998418423acb82ccca419c02b4f7c0abf6574e3ba9e370a9d463b51ae3409d76
+  metadata.gz: 58c68ab8bd9ce6ae758ef8a9b2aeb69272dac07ef633e6d400dce01498e4a45a
+  data.tar.gz: d118362c2a39b59d6739c67623b31d8a957c093e8b280360be969643041b15f2
 SHA512:
-  metadata.gz: 259638f0ce661b7c766787071fa5b6174e3a0f2ca5d0b027375717e1f191315c44d10308819fd7d17ee019fde9d7418f01c8f13614c9c83154616ca4845c9eff
-  data.tar.gz: 47eca8ccd4000c0f22712818d8e72d7e7f4e37f5f523db0a59ff7441c119ff1ae5e29f4c5bef58c04831ee5b65e9bea7283c064bb4008a5732080cdb80f2ca9c
+  metadata.gz: dc4582dc42ff629f85115a37e5456f6339ec7fe27f6e9b568fa6af1096d42c362aa5eb6bd767ceb40fb8f2e0f781cf642cfecd454631e34e937961e5c5b3ca45
+  data.tar.gz: d7c4b776c8720cd9c04bbc0b002d9a355ce23ea57668bb42df2bb7c3224a2a654776ff67ed8c0ad6b0c74a6173557ef650bb7a5f3f1178e042d379c8f833b6a6

data/README.adoc

@@ -21,10 +21,9 @@ Key features:
    installed — Nokogiri otherwise and for HTML; both byte-compatible, engine
    parity is spec-gated
 ** JSON on https://github.com/leptris/yeptris[libyeptris]' strict JSON surface
-   whenever the native materializer is installed (`gem install yeptris` —
-   platform gems, zero compilation), the stdlib JSON extension otherwise
-** YAML on yeptris opt-in (`CANON_YAML_BACKEND=yeptris`, ~3x Psych loads);
-   Psych otherwise
+   (yeptris is a required gem — platform gems, zero compilation)
+** YAML on yeptris (default — byte-parity with Psych, gated by the dump
+   corpus in the suite); Psych via `CANON_YAML_BACKEND=psych`
 
 == When to use formatting vs comparison
 

data/lib/canon/comparison/comparison_result.rb

@@ -56,6 +56,23 @@ parse_errors_expected: nil, parse_errors_received: nil)
         @original_strings || preprocessed_strings
       end
 
+      # The lazy display-string builder is a Proc, which Marshal (and
+      # every serializing test-distribution tool) cannot dump.
+      # Materialize first — the restored copy carries plain strings
+      # and round-trips exactly like the pre-lazy results.
+      def marshal_dump
+        preprocessed_strings
+        [@differences, @preprocessed_strings, @original_strings,
+         @format, @html_version, @match_options, @algorithm,
+         @parse_errors_expected, @parse_errors_received]
+      end
+
+      def marshal_load(data)
+        @differences, @preprocessed_strings, @original_strings,
+          @format, @html_version, @match_options, @algorithm,
+          @parse_errors_expected, @parse_errors_received = data
+      end
+
       # Whether either side reported parse errors.  Used by the diff
       # formatter to decide whether to render the parse-error banner.
       #

data/lib/canon/comparison/xml_comparator/child_comparison.rb

@@ -122,6 +122,23 @@ module Canon
           end
 
           # Process ElementMatcher results
+          # Position differences carry element identity — a bare
+          # "position 0 vs position 1" next to identical-looking
+          # Expected/Actual payloads reads as a canon false positive
+          # when the real change is sibling order (e.g. id="1" and
+          # id="2" swapped).
+          def position_reason(elem, pos)
+            return "position #{pos}" if elem.nil?
+
+            label = elem.name.to_s
+            attrs = Canon::Diff::NodeSerializer.extract_attributes(elem)
+            return "position #{pos}" if attrs.nil? || attrs.empty?
+
+            id_like = %w[id href name].filter_map { |k| attrs[k] && "#{k}=#{attrs[k]}" }
+            id_like << attrs.first.then { |k, v| "#{k}=#{v}" } if id_like.empty?
+            "#{label}[#{id_like.first}] at position #{pos}"
+          end
+
           def process_matches(matches, _children1, _children2, _parent_node, comparator,
                              opts, child_opts, diff_children, differences)
             all_equivalent = true
@@ -137,7 +154,8 @@ module Canon
                   # Only create DiffNode if element_position is not :ignore
                   if position_behavior != :ignore
                     comparator.add_difference(match.elem1, match.elem2,
-                                              "position #{match.pos1}", "position #{match.pos2}",
+                                              position_reason(match.elem1, match.pos1),
+                                              position_reason(match.elem2, match.pos2),
                                               :element_position, opts, differences)
                     all_equivalent = false if position_behavior == :strict
                   end

data/lib/canon/version.rb

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

metadata

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