canon 0.3.60 → 0.3.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1cbc73f1d667885f1f989a9534d8123dbcc67ae7eda250cc24cba00e7ad24a7
-  data.tar.gz: b9a27d00c02f533c6679237e190eb7f6bc6532fe0f945957bdc5d521bb84217b
+  metadata.gz: b5b90b7fc1d45d8f8e58e804f3f67dae934cc225639f3196c64f43cdd84ae005
+  data.tar.gz: c6615312bb2ac6eba00700c60b7dfeeb18277b8677532f98f91e4ad24a29c562
 SHA512:
-  metadata.gz: b060895cd58c7321db7d0640a02ca166f3efb9b5cb4c90d5fafb7d615b3faf6c73f4e29d42533d56ac9fd393e625bac473d9cd122273dc81b3598b0be76b86f9
-  data.tar.gz: 4b160273200d229151e61842bc994cd8e1d23f495107f495edde383b2fdccda2e9de150a65160d34c5e3177a7bf236282a6e1bb675c72b2bf667deb200e3dab4
+  metadata.gz: 75e2773c9597d616988157bdd40f4df3478dfd5695c1b9c7b9fc3709a6b043e22e98d3a1d9f2221ad06f7d4bb249331b1356606dce4acf10ce4bdfd8c254d209
+  data.tar.gz: 2877cc2367ac8da5ef68ea9b2ba2cc94883754a47aaf7dba51aef1050d67b9f3d95027238a539e119c92704fa696bdd8de8412bf178098a00e03061fbbb48888

data/lib/canon/comparison/xml_comparator.rb

@@ -201,11 +201,17 @@ module Canon
         # side answers both; any hit falls through to the pipeline.
         def verbose_report_proven_empty?(n1, n2, opts)
           return true unless opts[:verbose]
+
           # Identical input parses identically — differences and
-          # attribute order coincide by construction; only the SAX
-          # recover-error surface (parse-error banner, issue #130)
-          # needs its one scan.
-          return !Xml::Sax.probe(n1).saw_error? if n1 == n2
+          # attribute order coincide by construction. Recover errors
+          # ride the fingerprint's diag check when the engine exposes
+          # them (libleptris 1.9.205+, #1200); otherwise the one SAX
+          # scan covers the parse-error banner (issue #130).
+          if n1 == n2
+            return true if Xml::DigestGate.recover_diags_available?
+
+            return !Xml::Sax.probe(n1).saw_error?
+          end
 
           left = Xml::Sax.probe(n1)
           return false if left.saw_error?

data/lib/canon/version.rb

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

data/lib/canon/xml/digest_gate.rb

@@ -21,6 +21,28 @@ module Canon
     module DigestGate
       module_function
 
+      # libleptris 1.9.205+ records duplicate-attribute recover
+      # events on the parsed document (#1200): read through the
+      # FFI diag counter. Evaluated lazily at call time — a load-time
+      # constant would freeze before leptris loads (defined? never
+      # resolves pending autoloads). When the adapter is not leptris
+      # (or the binding predates the surface), the verbose lane
+      # falls back to the SAX probe for its error scan.
+      def recover_diags_available?
+        defined?(::Leptris::XML::FFI) &&
+          ::Leptris::XML::FFI.respond_to?(:leptris_document_parse_diag_count)
+      rescue StandardError
+        false
+      end
+
+      def recover_diags?(doc)
+        return false unless recover_diags_available?
+
+        native = doc.native
+        native = native.c_ptr if native.respond_to?(:c_ptr)
+        ::Leptris::XML::FFI.leptris_document_parse_diag_count(native).positive?
+      end
+
       def available?
         return false if RUBY_ENGINE == "opal"
         return false unless Canon::XmlBackend.moxml? &&
@@ -106,7 +128,11 @@ module Canon
         doc = context.parse(xml, readonly: true, strict: false)
         root = doc.root
         return nil unless root
-        return nil if clean && doc.parse_errors.any?
+
+        if clean
+          return nil if doc.parse_errors.any?
+          return nil if recover_diags?(doc)
+        end
 
         skeleton = doc.children.filter_map do |child|
           next if Canon::XmlParsing.same_engine_node?(child, root)

metadata

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