moxml 0.5.15 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '098d93bb8d9951a645e7f49e4031993942b8965368b8dcdbcc6e590514633571'
-  data.tar.gz: b1f5f35e34a6a458547d7740860d0bdb7d786fb857532050191ac2c188906794
+  metadata.gz: 39cfbe08ea2a0e92f2ba89e83beacf564401765e964807dc4d73ca23d867af38
+  data.tar.gz: cdd5d499fd4b3233a6c4d2774b188aef2339f341f7c7a7112a82ac392ec4e53b
 SHA512:
-  metadata.gz: 4bdb52155bbfeb4f4e8567d2feb3e0b705562340db67955c346a0c1980823743ef882fb44c0d4abd6a42eefa5b1a8fd8bf77f2c20fd72c8074f70e187e0fe199
-  data.tar.gz: cb5f85126e157a7271c052632bdcd6a42c4f2e99c9096bac69ea50aa5cfd75b98f9bc94f5d502f63298cc2e9c687706cb45a49aeeae17d6abd56d1301b858d8d
+  metadata.gz: 894d6bacdd4f26dbb2a59b0684b29e8ca68b39b66f841a5cd11005351eff38404e745b47d58bb860c898d3da92e1e2a769210938f26cac2f88cac34cc887de76
+  data.tar.gz: c5b7b7c9de4f2362e910b740ce4cf6185a72773f39f31a3dfc17fbd7436f65f542e66ff099900bf9073e87bd5975568cb3833ac658115ea5ee21a4218719ce90

data/Gemfile

@@ -9,7 +9,7 @@ gemspec
 gem "benchmark"
 gem "benchmark-ips"
 gem "get_process_mem"
-gem "leptris", "~> 1.1"
+gem "leptris", "~> 1.9.32"
 gem "libxml-ruby", "~> 5.0"
 gem "nokogiri", "~> 1.18"
 gem "openssl", "~> 3.0"

data/docs/_pages/adapter-protocol.adoc

@@ -86,9 +86,9 @@ eight record fields per node, returning nil falls back to the
 generic wrapper walk. Leptris walks raw C pointers with the batch
 `leptris_node_children` call — no wrappers, no per-node callback.
 
-Constants like `DOC_NODE_SUPPORTED` / `DTDATTR_SUPPORTED` /
-`BULK_FIELD_READS` (Leptris) follow the same idea: one probe
-per engine capability, computed at load.
+Version gates like `PREFIXED_ATTR_PREDICATES_NATIVE` and the
+`MINIMUM_BINDING_VERSION` floor (Leptris) follow the same idea: one
+probe per engine capability, computed at load.
 
 == Return shapes
 

data/docs/_pages/adapters/leptris.adoc

@@ -13,11 +13,14 @@ with a native XPath 1.0 engine, SAX, and canonicalization.
 
 == Default resolution
 
-Leptris becomes the default when the installed binding supports
-programmatic document construction (`Leptris::XML::Document.create`,
-leptris >= 1.3). Otherwise the default falls back to Nokogiri. Under
-Opal the default is rexml (stock oga requires its C extension and
-libleptris does not build for Opal).
+Leptris becomes the default when the installed binding meets the
+adapter's floor — `Moxml::Adapter::Leptris::MINIMUM_BINDING_VERSION`
+(leptris >= 1.9.32; issue #149): bounded traverse, built documents
+that reflect their parts immediately, and every capability surface
+the adapter assumes. Below the floor the default falls back to
+Nokogiri rather than driving a binding the adapter no longer
+accommodates. Under Opal the default is rexml (stock oga requires
+its C extension and libleptris does not build for Opal).
 
 [source,ruby]
 ----

data/lib/moxml/adapter/leptris/document_parts.rb

@@ -10,7 +10,7 @@ module Moxml
         # swept too (the context wrapper identity map self-cleans via
         # its size valve).
         DOCUMENT_ATTACHMENT_KEYS = %i[
-          entity_markers doc_pi_nodes declaration doctype
+          entity_markers declaration doctype
           had_source_declaration document_text
         ].freeze
 
@@ -29,64 +29,18 @@ module Moxml
           doctype_wrapper = attachments.get(doc, :doctype)
           children << doctype_wrapper if doctype_wrapper
 
-          if DOC_NODE_SUPPORTED
-            # The libxml2-model document node lists prolog PIs/comments,
-            # the root, and epilog PIs/comments in document order —
-            # the Nokogiri-shaped contract, epilog anchoring included
-            # (issue #130). Built (programmatic) documents are not yet
-            # fully reflected by the node (binding gap: an attached
-            # root does not appear); document_node_children answers
-            # nil there for the legacy parts path.
-            doc_children = document_node_children(doc)
-            if doc_children
-              children.concat(doc_children)
-            else
-              children.concat(document_pi_nodes(doc))
-              children << doc.root if doc.root
-            end
-          else
-            # Legacy path: document-level PIs live outside the element
-            # tree in a flat pre-root list (libleptris < 1.9.7 C
-            # model); epilog anchoring is not representable there.
-            children.concat(document_pi_nodes(doc))
-
-            children << doc.root if doc.root
-          end
+          # The libxml2-model document node lists prolog PIs/comments,
+          # the root, and epilog PIs/comments in document order — the
+          # Nokogiri-shaped contract, epilog anchoring included (issue
+          # #130). Built documents reflect their parts immediately
+          # since leptris-ruby 1.9.32 (leptris-ruby#91).
+          children.concat(doc.children.to_a)
 
           texts = attachments.get(doc, :document_text)
           children.concat(texts) if texts
           children
         end
 
-        # Document-level PI pseudo-nodes, materialized once from the C
-        # list and cached per document: children and serialization read
-        # the same objects, so wrapper mutations round-trip. Build the
-        # cache BEFORE appending a PI with add_pi, or the C-side
-        # addition would be double-counted.
-        # The document node's children, or nil when the node does not
-        # reflect reality: parsed documents always list the root
-        # element among their children, but programmatically built
-        # ones do not (binding gap) — those keep the legacy parts
-        # path.
-        def document_node_children(doc)
-          doc_children = doc.children.to_a
-          has_root = doc_children.any?(::Leptris::XML::Element)
-          return doc_children if has_root
-          return doc_children if doc.root.nil?
-
-          nil
-        end
-
-        def document_pi_nodes(doc)
-          attachments.get(doc, :doc_pi_nodes) || begin
-            nodes = doc.processing_instructions.map do |(target, data)|
-              CustomizedLeptris::DocumentPI.new(target, data, doc)
-            end
-            attachments.set(doc, :doc_pi_nodes, nodes)
-            nodes
-          end
-        end
-
         def add_document_child(doc, child)
           case child
           when CustomizedLeptris::Declaration
@@ -102,15 +56,9 @@ module Moxml
           when ::Leptris::XML::Element
             doc.root = child
           when ::Leptris::XML::ProcessingInstruction
-            document_pi_nodes(doc)
             doc.add_pi(child.target, child.content.to_s)
-            document_pi_nodes(doc) << CustomizedLeptris::DocumentPI.new(
-              child.target, child.content.to_s, doc
-            )
           when CustomizedLeptris::DocumentPI
-            document_pi_nodes(doc)
             doc.add_pi(child.target, child.data)
-            document_pi_nodes(doc) << child
           when ::Leptris::XML::Text
             texts = attachments.get(doc, :document_text) || []
             texts << child
@@ -149,22 +97,10 @@ module Moxml
           native = native_doctype_xml(doc)
           parts << native << "\n" if native
 
-          if DOC_NODE_SUPPORTED
-            # The libxml2-model document node: prolog PIs/comments,
-            # the root, epilog PIs/comments — in document order, so
-            # epilog parts serialize after the root (issue #130).
-            doc_children = document_node_children(doc)
-            if doc_children
-              doc_children.each { |child| parts << raw_serialize(child, options) << "\n" }
-            else
-              document_pi_nodes(doc).each { |pi| parts << pi.to_xml << "\n" }
-              parts << raw_serialize(doc.root, options) << "\n" if doc.root
-            end
-          else
-            document_pi_nodes(doc).each { |pi| parts << pi.to_xml << "\n" }
-
-            parts << raw_serialize(doc.root, options) << "\n" if doc.root
-          end
+          # The libxml2-model document node: prolog PIs/comments, the
+          # root, epilog PIs/comments — in document order, so epilog
+          # parts serialize after the root (issue #130).
+          doc.children.each { |child| parts << raw_serialize(child, options) << "\n" }
 
           texts = attachments.get(doc, :document_text)
           texts&.each { |text| parts << XmlEmitter.escape_text(text.content.to_s) }

data/lib/moxml/adapter/leptris/materialize.rb

@@ -39,8 +39,6 @@ module Moxml
         end
 
         def materialize_fields(native, buffers, &block)
-          return nil unless Leptris::BULK_FIELD_READS
-
           doc = native.is_a?(::Leptris::XML::Document) ? native : native.document
           # Marker-bearing text needs the split pipeline (children-level
           # ER expansion); the bulk path has no marker handling.

data/lib/moxml/adapter/leptris.rb

@@ -4,11 +4,6 @@ return if RUBY_ENGINE == "opal"
 
 require "stringio"
 require "leptris"
-# leptris-ruby 1.9.0 regression (leptris-ruby#53): the eager ffi load
-# shadows the Leptris::XML autoload manifest, leaving Document/Element
-# unreachable. Loading the manifest explicitly is a no-op when the gem
-# is fixed.
-require "leptris/xml"
 
 module Moxml
   module Adapter
@@ -19,29 +14,14 @@ module Moxml
     # programmatic DOCTYPE, so those live in CustomizedLeptris value
     # objects stored through NativeAttachment.
     class Leptris < Base
-      # libleptris 1.9.7 (leptris-ruby 1.9.26): Document#node exposes
-      # the libxml2-model document node — prolog/epilog parts in
-      # document order. Older bindings keep the flat pre-root PI path.
-      DOC_NODE_SUPPORTED = ::Leptris::XML::Document.method_defined?(:node)
-      # libleptris 1.9.8 (leptris-ruby 1.9.30): plain parse excludes
-      # DTD ATTLIST defaults, matching libxml2/Nokogiri semantics;
-      # ParseOptions::DTDATTR opts in (leptris/leptris#606).
-      DTDATTR_SUPPORTED = ::Leptris::XML::ParseOptions.const_defined?(:DTDATTR)
-
-      # The raw field-read surface for the bulk materializer (issue
-      # #143). Bindings without the full set fall back to the generic
-      # wrapper walk.
-      BULK_FIELD_READS = %i[
-        leptris_node_children leptris_node_get_type
-        leptris_element_name leptris_element_prefix leptris_element_namespace
-        leptris_element_namespace_count leptris_element_namespace_decl_prefix
-        leptris_element_namespace_decl_uri leptris_element_first_attribute
-        leptris_attribute_get_name leptris_attribute_get_value
-        leptris_attribute_next leptris_attribute_namespace_uri
-        leptris_text_node_get_content leptris_cdata_node_get_content
-        leptris_comment_node_get_content leptris_pi_node_get_target
-        leptris_pi_node_get_data
-      ].all? { |fn| ::Leptris::XML::FFI.respond_to?(fn) }
+      # The binding floor (issue #149): 1.9.32 carried the traverse
+      # fix (leptris-ruby#89) and made built documents reflect their
+      # parts immediately (leptris-ruby#91); the document node
+      # (1.9.26), DTDATTR (1.9.8), and the batch child-pointer read
+      # (1.7.0) surfaces predate it. Older bindings are not eligible
+      # for the default (see Config.leptris_preferred_available?) and
+      # the adapter no longer carries accommodation paths for them.
+      MINIMUM_BINDING_VERSION = "1.9.32"
 
       # leptris-ruby#103: prefixed attribute tests inside predicates
       # stopped resolving through the document's in-scope declarations
@@ -115,12 +95,11 @@ module Moxml
           doc
         end
 
-        # nil when DTDATTR is unsupported or not requested — the
-        # binding treats a nil options hash as plain defaults.
+        # nil unless DTDATTR is requested — the binding treats a nil
+        # options hash as plain defaults (defaults exclude ATTLIST
+        # defaults, matching libxml2/Nokogiri semantics).
         def dtdattr_parse_options(options)
-          return nil unless DTDATTR_SUPPORTED && options[:dtdattr] == true
-
-          ::Leptris::XML::ParseOptions.dtdattr
+          options[:dtdattr] == true ? ::Leptris::XML::ParseOptions.dtdattr : nil
         end
 
         def parse_errors(native_doc)

data/lib/moxml/config.rb

@@ -58,18 +58,20 @@ module Moxml
         OPAL_FALLBACK_ADAPTER
       end
 
-      # True when the leptris gem is installed AND new enough for the
-      # adapter (it needs programmatic document construction, which
-      # released 1.1.x lacks). Memoized: the require probe runs once.
+      # True when the leptris gem is installed AND meets the adapter's
+      # binding floor (issue #149; 1.9.32 — traverse bounding #89,
+      # built-docs parts #91, and every capability surface the adapter
+      # now assumes). Memoized: the probe runs once. Below the floor
+      # the default falls back to Nokogiri rather than driving a
+      # binding the adapter no longer accommodates.
       def leptris_preferred_available?
         return @leptris_preferred_available if defined?(@leptris_preferred_available)
 
         @leptris_preferred_available = begin
           require "leptris"
-          # leptris-ruby 1.9.0 regression (leptris-ruby#53): the XML
-          # autoload manifest is shadowed; load it explicitly.
-          require "leptris/xml"
-          ::Leptris::XML::Document.respond_to?(:create)
+          Moxml::Adapter.load(:leptris)
+          Gem::Version.new(::Leptris::VERSION) >=
+            Gem::Version.new(Moxml::Adapter::Leptris::MINIMUM_BINDING_VERSION)
         rescue LoadError, NameError
           false
         end

data/lib/moxml/version.rb

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

data/spec/moxml/adapter/leptris_spec.rb

@@ -186,16 +186,12 @@ RSpec.describe Moxml::Adapter::Leptris do
     end
 
     it "excludes ATTLIST defaults on plain parse" do
-      skip "requires leptris with no-DTDATTR semantics" unless Moxml::Adapter::Leptris::DTDATTR_SUPPORTED
-
       doc = ctx.parse(dtd_xml)
       expect(doc.at_xpath("//e9")["attr"]).to be_nil
       expect(doc.to_xml).not_to include("attr=")
     end
 
     it "materializes ATTLIST defaults with dtdattr: true" do
-      skip "requires leptris with ParseOptions::DTDATTR" unless Moxml::Adapter::Leptris::DTDATTR_SUPPORTED
-
       doc = ctx.parse(dtd_xml, dtdattr: true)
       expect(doc.at_xpath("//e9")["attr"]).to eq("default")
       expect(doc.to_xml).to include(%(attr="default"))

data/spec/moxml/adapter/platform_spec.rb

@@ -85,7 +85,7 @@ RSpec.describe Moxml::Adapter do
         .to include(Moxml::Config.default_adapter)
     end
 
-    it "prefers leptris only when the installed gem supports document construction" do
+    it "prefers leptris only when the installed binding meets the floor" do
       if Moxml::Config.leptris_preferred_available?
         expect(Moxml::Config.runtime_default_adapter).to eq(:leptris)
       else
@@ -93,6 +93,15 @@ RSpec.describe Moxml::Adapter do
       end
     end
 
+    it "pins the leptris binding floor at 1.9.32 (issue #149)" do
+      skip "leptris not installed" unless described_class.available?(:leptris)
+
+      adapter = described_class.load(:leptris)
+      expect(adapter::MINIMUM_BINDING_VERSION).to eq("1.9.32")
+      expect(Gem::Version.new(Leptris::VERSION))
+        .to be >= Gem::Version.new(adapter::MINIMUM_BINDING_VERSION)
+    end
+
     it "OPAL_DEFAULT_ADAPTER is a member of OPAL_AVAILABLE_ADAPTERS" do
       expect(Moxml::Adapter::OPAL_AVAILABLE_ADAPTERS)
         .to include(Moxml::Config::OPAL_DEFAULT_ADAPTER)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.16
 platform: ruby
 authors:
 - Ribose Inc.