moxml 0.5.112 → 0.5.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a1ceed1b65075fbb6187383de91bba6fa8a4dc98d7b6c5e1a8b72c6cdbd5c8
-  data.tar.gz: f60b17278dd6ce812b27e7bcae595fe464d3192d24bfd68c0b6fb98c285b4dea
+  metadata.gz: c61331ea3536aa41170080eb6233643b3b48da707d268da9185ed11fbdcad87d
+  data.tar.gz: ef1765b2e2651438c8d38012ea374e2a8b9fe6ebcaff63d2afaf476eb0f727ab
 SHA512:
-  metadata.gz: 7a4fd16c91ce73fe9fd1ce72d617fe1d5009d454e5bf8418b1e96f36c804459e4b0186d593b813a84d9092fb9c5818f6b25a95aac6b69feedc34eeba2822ad26
-  data.tar.gz: 7f1238c394d8ad91e18176ca7d863477ed968fc91bf093a5113885c33665a15a1f83a2696fa68131e039344905679739f97d4c0b1f5ef06b1baf438231ad74c3
+  metadata.gz: 2058949ca13a105d38f86b5c38acf3fb974ca9445faedda64ea7d857bf8f10561d5b6df42d7b56ede501d0fcb9186f0347349faee29dd66868b83ec47a94ac4c
+  data.tar.gz: c7c7b4f0b0d529ec793e790072d2115fe6ff7c17a389e08a84abadc2ab324e058f4f49d1e5d5a6e1143b0f688ac893b5ebae083638f1482b9b526b99d7c636fd

data/lib/moxml/adapter/leptris.rb

@@ -1893,6 +1893,44 @@ module Moxml
           installed
         end
 
+        # moxml#335: the engine's document resolution can mis-report
+        # pool ownership under spec-order state (the #1242 TLS-memo
+        # family), so a plain add can -1 for ANY node kind — not just
+        # elements and text. Elements rebuild structurally (the #376
+        # contract); every other kind carries no cross-document
+        # identity worth preserving, so reconstruct it in the parent's
+        # document through the binding's create faces.
+        def rebuild_foreign_child(parent_nn, child_nn)
+          doc = NN_DOCUMENT.bind_call(parent_nn)
+          rebuilt =
+            case child_nn.node_type
+            when :element
+              return structural_adopt(parent_nn, child_nn)
+            when :text
+              doc.create_text_node(child_nn.text)
+            when :comment
+              doc.create_comment(child_nn.text)
+            when :cdata
+              doc.create_cdata(child_nn.text)
+            when :processing_instruction, :pi
+              doc.create_processing_instruction(
+                child_nn.target, child_nn.content.to_s
+              )
+            else
+              raise Moxml::DocumentStructureError.new(
+                "cannot rebuild a #{child_nn.node_type} node",
+              )
+            end
+          # The raw engine add rejects binding-family children —
+          # append through the FFI face like structural_adopt.
+          ::Leptris::XML::FFI.check_status(
+            ::Leptris::XML::FFI.leptris_element_append_child(
+              ::FFI::Pointer.new(parent_nn.address), rebuilt.c_ptr
+            ),
+          )
+          rebuilt
+        end
+
         def copy_binding_subtree(doc, src)
           sub = doc.create_element(src.name.to_s)
           (src.respond_to?(:attributes) ? src.attributes : {}).each do |k, v|
@@ -2107,24 +2145,15 @@ module Moxml
               child = doc.create_text_node(child) if child.is_a?(String)
               # The engine's document resolution can mis-report pool
               # ownership under spec-order state (the #1242 TLS-memo
-              # family) — an -1 rejection falls back to the structural
-              # adopt for elements rather than raising through the flow.
+              # family) — an -1 rejection rebuilds the child in the
+              # parent's document for every reconstructible kind
+              # (moxml#335), rather than raising through the flow.
               begin
                 return NN_ADD_CHILD.bind_call(parent, child)
               rescue ::Leptris::XML::Error, ::RuntimeError => e
                 raise unless e.message.include?("append_child failed")
-                raise unless %i[element text].include?(child.node_type)
 
-                if child.node_type == :element
-                  structural_adopt(parent, child)
-                else
-                  # A text node carries no cross-document identity worth
-                  # preserving: rebuild it in the parent's document
-                  NN_ADD_CHILD.bind_call(
-                    parent,
-                    doc.create_text_node(child.text),
-                  )
-                end
+                rebuild_foreign_child(parent, child)
               end
             end
 

data/lib/moxml/version.rb

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

data/spec/moxml/adapter/leptris_adoption_spec.rb

@@ -10,6 +10,7 @@ require "spec_helper"
 # names, doc-owned).
 RSpec.describe "leptris cross-document adoption" do
   let(:ctx) { Moxml.new(:leptris) }
+  let(:ad) { Moxml::Adapter::Leptris }
 
   it "add_child lands the adopted copy in the tree" do
     doc = ctx.parse("<r><a/></r>")
@@ -100,4 +101,49 @@ RSpec.describe "leptris cross-document adoption" do
       expect(mid.root.to_xml).not_to include("<deep")
     end
   end
+
+  # moxml#335: the -1 fallback must not re-raise by node kind — the
+  # engine's document resolution can mis-report pool ownership for
+  # ANY child (the #1242 TLS-memo family), and only elements have a
+  # cross-document identity worth a structural rebuild. The helper
+  # is specced directly: the engine failure is CI-only, so forcing
+  # the -1 locally is not reproducible.
+  context "when the add_child -1 rebuild fallback fires" do
+    it "rebuilds comments in the parent's document" do
+      doc = ctx.parse("<r/>")
+      other = ctx.parse("<other><!-- note --></other>")
+      ad.rebuild_foreign_child(doc.root.native, other.root.children.first.native)
+      expect(doc.root.to_xml).to include("<!-- note -->")
+      expect(other.root.to_xml).to include("<!-- note -->")
+    end
+
+    it "rebuilds CDATA in the parent's document" do
+      doc = ctx.parse("<r/>")
+      other = ctx.parse("<other><![CDATA[x < y]]></other>")
+      ad.rebuild_foreign_child(doc.root.native, other.root.children.first.native)
+      expect(doc.root.to_xml).to include("<![CDATA[x < y]]>")
+    end
+
+    it "rebuilds processing instructions in the parent's document" do
+      doc = ctx.parse("<r/>")
+      other = ctx.parse("<other><?tgt data='1'?></other>")
+      ad.rebuild_foreign_child(doc.root.native, other.root.children.first.native)
+      expect(doc.root.to_xml).to include("<?tgt data='1'?>")
+    end
+
+    it "rebuilds text in the parent's document" do
+      doc = ctx.parse("<r/>")
+      other = ctx.parse("<other>t</other>")
+      ad.rebuild_foreign_child(doc.root.native, other.root.children.first.native)
+      expect(doc.root.to_xml).to include(">t<")
+    end
+
+    it "rebuilds elements structurally" do
+      doc = ctx.parse("<r/>")
+      other = ctx.parse("<other><e k='v'>t</e></other>")
+      ad.rebuild_foreign_child(doc.root.native, other.root.children.first.native)
+      expect(doc.at("//r/e")["k"]).to eq("v")
+      expect(doc.at("//r/e").text).to eq("t")
+    end
+  end
 end

metadata

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