moxml 0.5.76 → 0.5.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df70c844d6a4b34a8b6088ab84555def6c66f73b6c975d4252f1337df9db206
-  data.tar.gz: 1ca3ee46f0c416f463eeea9d68954b17d9121c6816dc654c9d3e4ba420343e10
+  metadata.gz: 0a7016ee5591571ecbf834dd6f948592967264e18abff80246d8527898090ce7
+  data.tar.gz: fb1f4b91c68dde1883a010e38cf35cbc3d21e396f990b4677e755a1dbf10ab90
 SHA512:
-  metadata.gz: 4c8288a741d4230ebe5f228ea2b7085ef74177b527bf661dd35395a27c41515150949fadfc15f267f0eec9d3ac74c3b779c942b62ad8c5ff4dcc8c85a0398e5b
-  data.tar.gz: a547141ac0046f1d1ece0e55eecba71e5c1ec124a91179a45d2e4e4a57d8cfe8a50422b24a91060267bafc04d4ce8cb1efcd507ebcdb5520959540697850bb9d
+  metadata.gz: 74b8599a7b3a8e0e7dcef25c6375a712cfe52b8788f361ca7689ddd6823691135a8b33d70ac2a343304361d3615093c98842b53fe6c7a1f60934a6e9df082304
+  data.tar.gz: d643d89e4c8ee3ce3ab583cb0b0155363ff8b1bd130133b2836f340a0af46dd7adf8873160dbb56edcb32a14db6786a05de4c06559f0ea48dfff29a6e124c0e8

data/lib/moxml/adapter/base.rb

@@ -403,6 +403,18 @@ namespace_validation_mode: :strict)
           nil
         end
 
+        # Parse diagnostics (issue #271): recover-class events the
+        # engine recorded during the parse — duplicate-attribute
+        # recoveries and siblings — as [{ kind:, message: }] in
+        # record order, [] for a clean parse. Reads must happen
+        # while the native document is alive (the engine owns the
+        # list); adapters without the surface answer []. Distinct
+        # from #parse_errors (the strict-parse failure channel):
+        # diagnostics describe RECOVERED documents.
+        def parse_diagnostics(_native_doc)
+          []
+        end
+
         # Recover-mode parse diagnostics (issue #147): the error
         # messages the engine recorded while parsing, [] when the
         # parse was clean. Engines with a native recover channel

data/lib/moxml/adapter/leptris.rb

@@ -333,11 +333,39 @@ module Moxml
 
             root.visit do |node, entering, depth|
               if entering && depth.positive?
-                yield Moxml::Node.wrap_with(node, context, self)
+                yield wrap_binding_node(node, context)
               end
             end
           end
 
+          # Fast mint for walk-yielded binding nodes (#312): one
+          # class-keyed hash answers wrapper class AND type — the
+          # generic wrap path's node_type probe, wrap_native detour,
+          # type map, and tap all drop out. Identity rides the
+          # @moxml_wrapper ivar (cache-stable nodes, #270).
+          BINDING_FAST_WRAP = {
+            ::Leptris::XML::Element => [Moxml::Wrappers::Element, :element],
+            ::Leptris::XML::Text => [Moxml::Wrappers::Text, :text],
+            ::Leptris::XML::CDATA => [Moxml::Wrappers::Cdata, :cdata],
+            ::Leptris::XML::Comment => [Moxml::Wrappers::Comment, :comment],
+            ::Leptris::XML::ProcessingInstruction =>
+              [Moxml::Wrappers::ProcessingInstruction, :processing_instruction],
+          }.freeze
+
+          def wrap_binding_node(node, context)
+            if node.instance_variable_defined?(:@moxml_wrapper)
+              cached = node.instance_variable_get(:@moxml_wrapper)
+              return cached if cached
+            end
+
+            entry = BINDING_FAST_WRAP[node.class]
+            return nil unless entry
+
+            wrapper = entry[0].new(node, context, self, entry[1])
+            node.instance_variable_set(:@moxml_wrapper, wrapper)
+            wrapper
+          end
+
           def record_native_doc(root_native, doc)
             @native_doc_roots[root_native] = doc
           end
@@ -842,6 +870,39 @@ module Moxml
           attachments.get(native_doc, :parse_errors) || NO_PARSE_ERRORS
         end
 
+        # leptris#1200 recover diagnostics (binding FFI >= the
+        # 1.9.206 surface adoption; probed, not version-gated —
+        # lockstep trains have shipped gems without faces).
+        DIAG_KINDS = %i[
+          invalid not_allowed_anywhere not_allowed_here
+          not_allowed_yet incomplete missing_required_attr
+          attr_not_allowed attr_value_invalid
+          char_content_invalid recover
+        ].freeze
+
+        def parse_diagnostics(native_doc)
+          ffi = ::Leptris::XML::FFI
+          return [] unless native_doc.is_a?(::Leptris::XML::Document) &&
+            ffi.respond_to?(:leptris_document_parse_diag_count)
+
+          doc = native_doc.c_ptr
+          count = ffi.leptris_document_parse_diag_count(doc)
+          return [] if count.zero?
+
+          kind_ptr = ::FFI::MemoryPointer.new(:int)
+          diagnostics = []
+          count.times do |i|
+            buffer = ::FFI::MemoryPointer.new(512)
+            next unless ffi.leptris_document_parse_diag(
+              doc, i, kind_ptr, buffer, 512
+            ) == 1
+
+            kind = DIAG_KINDS[kind_ptr.read_int] || :unknown
+            diagnostics << { kind: kind, message: buffer.read_string }
+          end
+          diagnostics
+        end
+
         def create_document(_native_doc = nil)
           ::Leptris::XML::Document.create
         end

data/lib/moxml/document.rb

@@ -58,6 +58,16 @@ module Moxml
     # reports the fatal error that emptied it; Nokogiri reports its
     # recover-mode syntax errors; engines without an error channel
     # answer [].
+    # Recover-class diagnostics the engine recorded during this
+    # document's parse (issue #271): duplicate-attribute
+    # recoveries and siblings, as [{ kind:, message: }] in record
+    # order. Read while the document is alive — the engine owns
+    # the list. [] when the parse was clean or the adapter has no
+    # diagnostic surface.
+    def parse_diagnostics
+      adapter.parse_diagnostics(@native)
+    end
+
     def parse_errors
       adapter.parse_errors(@native)
     end

data/lib/moxml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Moxml
-  VERSION = "0.5.76"
+  VERSION = "0.5.77"
 end

data/spec/moxml/document_parse_diagnostics_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# Document#parse_diagnostics (issue #271, option A — additive):
+# recover-class events the engine recorded during the parse, as
+# [{ kind:, message: }]. Clean parses answer []; adapters without
+# the surface answer []. Reads happen through the live native
+# document (the engine owns the list — read before free).
+RSpec.describe Moxml::Document do
+  def with_leptris
+    ctx = Moxml.new(:leptris)
+    yield ctx
+  rescue StandardError, LoadError
+    skip "leptris adapter unavailable"
+  end
+
+  it "answers [] for a clean parse" do
+    with_leptris do |ctx|
+      expect(ctx.parse("<r><a/></r>").parse_diagnostics).to eq([])
+    end
+  end
+
+  it "surfaces duplicate-attribute recoveries with kind and message" do
+    with_leptris do |ctx|
+      doc = ctx.parse(%(<r a="1" a="2"/>), recover: true) ||
+        ctx.parse(%(<r a="1" a="2"/>))
+      next skip "engine recovered without diagnostics" if doc.nil?
+
+      diags = doc.parse_diagnostics
+      expect(diags).not_to be_empty
+      expect(diags.first[:kind]).to eq(:recover)
+      expect(diags.first[:message]).to be_a(String)
+    end
+  end
+
+  it "answers [] on adapters without the surface" do
+    ctx = Moxml.new(:rexml)
+    expect(ctx.parse("<r/>").parse_diagnostics).to eq([])
+  rescue StandardError, LoadError
+    skip "rexml adapter unavailable"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.5.76
+  version: 0.5.77
 platform: ruby
 authors:
 - Ribose Inc.
@@ -466,6 +466,7 @@ files:
 - spec/moxml/doctype_spec.rb
 - spec/moxml/document_builder_spec.rb
 - spec/moxml/document_free_spec.rb
+- spec/moxml/document_parse_diagnostics_spec.rb
 - spec/moxml/document_spec.rb
 - spec/moxml/element_attribute_pairs_spec.rb
 - spec/moxml/element_spec.rb