moxml 0.5.154 → 0.5.156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05a5f1f4e5475fe30f9d821cc2630f8c6d9d95aa38fa5d2e46e25e51605d1504
-  data.tar.gz: c47ee78ffb35d119b4a5c470e27e4dd0b9d3c4dfedba2c7d8bcc3aa17901d01b
+  metadata.gz: 578663f0e38750b9e430278d977cdbd765699eec0b9c0f24bf82248dd236f2c9
+  data.tar.gz: aed0e246d474008c4608131a0b7eb9059512cddfbf70cb967a24083a351a8ec2
 SHA512:
-  metadata.gz: 012cb442259cd2496eacf056b75e8ed050203eb92673b608b379305de4215f8c00c65b83b72d70027c7b2adbd9fd90d5eb2f41701de62305e291f7118fa9a44a
-  data.tar.gz: ceed6daf6824f3de929c14586b130fb014afc66b261bb3c76a92be0e09e1e33e4e41c8729f7a091dc80e71dbe36a67ffdffd66d454406e5a9a47494d634b294e
+  metadata.gz: 42e75eb3da6b57e6d9be43fa453557dba052d0d885c268fa58ff1e33c95b70e68eab294ca33a568d694e332824061d900312eaaceac933e65b9f1f537cfb9f73
+  data.tar.gz: fa0f76bfacf630899d54c1eae31db2c4bdd1fc9fb7e8c2a3f5e6fdbb76509a941fd15c66ab8bdfaaa6755ad3e6bf5041d1dc5ff9d62ca7c0391695ae959f7f23

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

@@ -14,6 +14,18 @@ module Moxml
           had_source_declaration document_text
         ].freeze
 
+        # The XML declaration kind is not stable across leptris
+        # releases: 1.9.345-era builds lack Leptris::XML::Declaration
+        # entirely (the pure-Ruby CustomizedLeptris twin carries the
+        # declaration then), later builds expose it again (and list it
+        # among the document children, leptris-ruby#459). Resolve the
+        # kind set once, by feature detection, and filter both kinds —
+        # the shim twin is never a listing node either way.
+        DECLARATION_KINDS = [
+          ::Moxml::Adapter::CustomizedLeptris::Declaration,
+          (::Leptris::XML::Declaration if ::Leptris::XML.const_defined?(:Declaration)),
+        ].compact.freeze
+
         def free_document(native)
           DOCUMENT_ATTACHMENT_KEYS.each { |key| attachments.delete(native, key) }
           native.free
@@ -39,17 +51,11 @@ module Moxml
           # leptris-ruby#459 lists the declaration among the binding
           # children; the Nokogiri-shaped facade contract never lists
           # it (the declaration is a preamble part, not a child node)
-          # — filtered at the listing seam. The constant is resolved
-          # conditionally: leptris releases before the declaration
-          # node class landed (e.g. 1.9.345) carry no Declaration at
-          # all, and referencing the constant unconditionally raises
-          # NameError on every document-children listing.
-          declaration_class =
-            if ::Leptris::XML.const_defined?(:Declaration, false)
-              ::Leptris::XML::Declaration
-            end
+          # — filtered at the listing seam.
           children.concat(
-            doc.children.to_a.grep_v(declaration_class),
+            doc.children.to_a.reject do |child|
+              DECLARATION_KINDS.any? { |kind| child.is_a?(kind) }
+            end,
           )
 
           texts = attachments.get(doc, :document_text)
@@ -175,7 +181,7 @@ module Moxml
             # emission (a second line here duplicates it — and the
             # 1.9.360 0-arity Declaration#to_xml raises under the
             # options-passing call).
-            next if child.is_a?(::Leptris::XML::Declaration)
+            next if DECLARATION_KINDS.any? { |kind| child.is_a?(kind) }
 
             parts << raw_serialize(child, options) << "\n"
           end

data/lib/moxml/adapter/leptris.rb

@@ -1285,27 +1285,41 @@ module Moxml
           end
         end
 
-        # 1.9.381.0: the children_read face stopped reflecting
-        # post-splice state — Element#add_next_sibling lands the node
-        # in the tree (native bulk reads and walk_columnar see it) but
-        # leaves the face's child list stale. Probe the exact repro
-        # once: prime the face, splice, and require children_read to
-        # see the inserted node. Unsafe builds take the adapter
-        # children path; fixed builds restore the fast path
-        # automatically.
+        # 1.9.381.0: the children_read face served a version-stamped
+        # child memo (leptris-ruby#530) that raw-FFI writes did not
+        # advance (leptris-ruby#545) — the adapter bumps the version at
+        # every raw site (leptris-ruby#543), and the binding's own
+        # element splice bumps it in C, so the memo observes splices.
+        # Probe that contract once with a live splice through the same
+        # faces the adapter uses: prime the memo, splice via the
+        # binding's Element face (NativeNode has no add_*_ sibling
+        # method), and require children_read to see the inserted node.
+        # Unsafe builds take the adapter children path; fixed builds
+        # restore the fast path automatically. Bindings without the
+        # memo faces have nothing to go stale.
         def children_read_splice_safe?
           return @children_read_splice_safe unless @children_read_splice_safe.nil?
 
-          @children_read_splice_safe = begin
-            native_doc = ::Leptris::XML::Document.parse("<r><a/>\n<b/></r>")
-            root = native_doc.root
-            root.children_read.to_a # prime the face's child list
-            a = root.children.to_a.first
-            a.add_next_sibling(native_doc.create_element("x"))
-            root.children_read.to_a.map { |n| n.name.to_s } == %w[a x b]
-          rescue StandardError
-            false
-          end
+          @children_read_splice_safe =
+            if !NN.method_defined?(:children_read) ||
+                !::Leptris::XML::Document.method_defined?(:native_node)
+              true
+            else
+              begin
+                native_doc = ::Leptris::XML::Document.parse("<r><a/>\n<b/></r>")
+                root = native_doc.native_node
+                root.children_read.to_a # prime the version-stamped memo
+                a = root.children.to_a.first
+                bridged = ::Leptris::XML::Node.wrap(
+                  ::FFI::Pointer.new(a.address), native_doc
+                )
+                bridged.add_next_sibling(native_doc.create_element("x"))
+                names = root.children_read.to_a.map { |n| n.name.to_s }
+                names[0] == "a" && names[1] == "x"
+              rescue StandardError
+                false
+              end
+            end
         end
 
         def xpath_index_document(node)

data/lib/moxml/version.rb

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

metadata

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