moxml 0.5.41 → 0.5.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d96e7e77957533fdb65727e5d244d038a6947b30a46563463b995114e4594faf
-  data.tar.gz: 11940d59f145433f37e0a5ea286055cf6d30167614291d007ff2d41dc68606a5
+  metadata.gz: 0c8fd5df5889694c9d7a3ee99c4caad866ddc40edd13ba46945f55e4e9f77a9b
+  data.tar.gz: ce14f6e9199e22576c0c5149e716a672efb9e44ef3a9b68d1b78abad02754a92
 SHA512:
-  metadata.gz: 25d5f4a19555bd8802f978a3586d2d4c7fc9770d918fbfee1777203d548c6ed8d0d67fa42fd4dcddc047675f2034482f1323542379fe61193358209a4f8670d0
-  data.tar.gz: be203488271f744cb405f70a48af237408870c433a7b5922c8cafb1f303b2a4a451d0b0f6c3c80ce249a9fe75ec98904c330ff3a0cda212587fb231aac255f53
+  metadata.gz: 93ac1cd541ed454ac89c10179e5e56f919a4cd309ae8f16abe02950ea5a6fedfdb03c53a7a8c23520616cd202a2b8f5384616ac8cd7b9e884d9f127c1d38bd98
+  data.tar.gz: ed75757fec960bd181921f9562650f4f3d44f2261fa0eb41a09437906d26581ad07c8b5446d0719a1d26b5308de2e1e25c60d2f0013da6861d144692d53eada4

data/docs/_pages/performance.adoc

@@ -293,12 +293,19 @@ scratch there. 1.9.163.2 moved the bulk into C and fixed the
 truncation — newer bindings use their C path (version-memoized,
 cheaper than a per-call count+copy).
 
-The native *builder* factories (native_create_element/text) are
-deliberately not adopted: native mutations do not advance the
-binding's document version, so the binding's memoized reads over
-the same tree go stale, and attaching the created natives pays a
-per-node `to_binding` bridge that costs more than the factory
-saves (create+attach measured 5816 -> 7697ns vs nokogiri 1750).
+The native builder factories (native_create_element/text) are
+adopted from 1.9.163.5, where native mutations became
+version-coherent with the binding (leptris-ruby#204/#208 — both
+surfaces' memos drop on mutation). The earlier rejection — stale
+binding memos plus a per-attach `to_binding` bridge costing more
+than the factory saved (5816 -> 7697ns vs nokogiri 1750) — no
+longer applies: `add_child` carries a both-native fast path with
+no bridge, and `doc_for` reads the 1.9.163.5 `NativeNode#document`
+accessor instead of the parent climb. create ×2 + attach:
+**4846 -> 2333ns (0.30x -> 0.78x of raw nokogiri)**. Attribute
+writes on native nodes still bridge (the native layer has no
+`[]=`), and the native `attributes` hash (name → String) does not
+fit the attribute-node contract — enumeration stays bridged.
 
 Serialize (document, 30KB): passing `encoding: "UTF-8"` when it
 equals the document's own ran a conversion pass for byte-identical

data/lib/moxml/adapter/leptris.rb

@@ -65,6 +65,15 @@ module Moxml
         defined?(::Leptris::XML::NativeNode) &&
         Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.163.2")
 
+      # 1.9.163.5 (leptris-ruby#204/#208): native mutations are
+      # version-coherent with the binding (both surfaces' memos
+      # drop on mutation) — the builder factories and native
+      # add_child are adoptable end-to-end; NativeNode grew a
+      # document accessor and line numbers.
+      NATIVE_MUTATIONS_COHERENT =
+        defined?(::Leptris::XML::NativeNode) &&
+        Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.163.5")
+
       # 1.9.163.2 moved the native bulk children into C
       # (Native.bulk_children) and fixed the 512 truncation
       # (leptris-ruby#202). The 162.6-163.1 window carries the
@@ -80,7 +89,17 @@ module Moxml
       # sites must never depend on the layer having loaded
       # (issue #217 — binding-only installs crashed on the
       # unguarded bridges).
+      # Class-body level: a bare @ivar inside `class << self` lands
+      # on the singleton's singleton, invisible to the methods at
+      # call time (same shape as @native_doc_roots below).
+      @binding_of = ObjectSpace::WeakMap.new
+
       class << self
+        # native -> bridged binding node. The bridge object is
+        # identity-stable for the native's lifetime (the binding's
+        # per-document wrap cache), so repeat bridges — the write
+        # loop on a factory-created element, re-accessed attribute
+        # lists — skip the document resolution and pointer wrap.
         # Binding node for any native: identity for binding nodes
         # (and on installs without the native layer — the constant
         # check short-circuits), a Node.wrap over the shared C
@@ -89,11 +108,14 @@ module Moxml
           return node unless NATIVE_READ_LAYER &&
             node.is_a?(::Leptris::XML::NativeNode)
 
+          bridged = @binding_of[node]
+          return bridged if bridged
+
           doc = doc_for(node)
           ptr = ::FFI::Pointer.new(node.address)
-          return ::Leptris::XML::Node.wrap(ptr, doc) if doc
-
-          ::Leptris::XML::Node.wrap(ptr, nil)
+          bridged = ::Leptris::XML::Node.wrap(ptr, doc)
+          @binding_of[node] = bridged unless bridged.nil?
+          bridged
         end
       end
 
@@ -130,6 +152,10 @@ module Moxml
           # to the root (C-bound reads) and look the doc up in the
           # root registry. Detached subtrees answer nil.
           def doc_for(node)
+            # The 1.9.163.5 native layer exposes the owning document
+            # directly; the root climb serves older bindings.
+            return node.document if NATIVE_MUTATIONS_COHERENT
+
             current = node
             current = current.parent while current&.parent
             @native_doc_roots[current]
@@ -268,7 +294,7 @@ module Moxml
         end
 
         def set_root(doc, element)
-          doc.root = element
+          to_binding(doc).root = to_binding(element)
         end
 
         def bare_set_qname_safe?
@@ -477,18 +503,24 @@ module Moxml
           ::Leptris::XML::Document.create
         end
 
-        # The native builder factories (native_create_element/text)
-        # are deliberately NOT adopted: native mutations do not
-        # advance the binding's document version, so the binding's
-        # memoized reads over the same tree go stale; attaching the
-        # created natives also pays a per-node to_binding bridge
-        # that costs more than the factory saves (create+attach
-        # measured 5816 -> 7697ns vs nokogiri 1750).
+        # Native builder factories: one C call and a TypedData wrap.
+        # Adopted from 1.9.163.5, where native mutations became
+        # version-coherent (leptris-ruby#204/#208) — the earlier
+        # rejection (stale binding memos + per-attach bridge cost)
+        # no longer applies: add_child carries a native fast path.
         def create_native_element(name, owner_doc = nil)
+          if NATIVE_MUTATIONS_COHERENT && owner_doc
+            return owner_doc.native_create_element(name.to_s)
+          end
+
           (owner_doc || create_document).create_element(name.to_s)
         end
 
         def create_native_text(content, owner_doc = nil)
+          if NATIVE_MUTATIONS_COHERENT && owner_doc
+            return owner_doc.native_create_text(content)
+          end
+
           (owner_doc || create_document).create_text_node(content)
         end
 
@@ -986,6 +1018,11 @@ module Moxml
         end
 
         def line_number(node)
+          if NATIVE_MUTATIONS_COHERENT &&
+              node.is_a?(::Leptris::XML::NativeNode)
+            line = node.line
+            return line.nil? || line.zero? ? nil : line
+          end
           return nil unless node.is_a?(::Leptris::XML::Node)
 
           line = node.line
@@ -1050,7 +1087,9 @@ module Moxml
         end
 
         def add_child(parent, child)
-          if NATIVE_READ_LAYER
+          if NATIVE_READ_LAYER && !(NATIVE_MUTATIONS_COHERENT &&
+                   parent.is_a?(::Leptris::XML::NativeNode) &&
+                   child.is_a?(::Leptris::XML::NativeNode))
             parent = to_binding(parent)
             child = to_binding(child)
           end
@@ -1070,7 +1109,10 @@ module Moxml
         end
 
         def add_previous_sibling(node, new_node)
-          node = to_binding(node) if NATIVE_READ_LAYER
+          if NATIVE_READ_LAYER
+            node = to_binding(node)
+            new_node = to_binding(new_node)
+          end
           # A PI inserted before the root lives at document level in
           # libleptris's model, not in the element tree.
           if new_node.is_a?(::Leptris::XML::ProcessingInstruction) &&
@@ -1082,7 +1124,10 @@ module Moxml
         end
 
         def add_next_sibling(node, new_node)
-          node = to_binding(node) if NATIVE_READ_LAYER
+          if NATIVE_READ_LAYER
+            node = to_binding(node)
+            new_node = to_binding(new_node)
+          end
           node.add_next_sibling(new_node)
         end
 

data/lib/moxml/adapter/rexml.rb

@@ -140,6 +140,7 @@ module Moxml
         end
 
         def set_root(doc, element)
+          doc.delete_element(doc.root) if doc.root
           doc.add_element(element)
         end
 

data/lib/moxml/version.rb

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

data/spec/integration/shared_examples/integration_workflows.rb

@@ -143,4 +143,38 @@ RSpec.shared_examples "Moxml Integration" do
       )
     end
   end
+
+  describe "document root assignment" do
+    it "attaches a factory-created element as the root and serializes" do
+      doc = context.create_document
+      root = doc.create_element("root")
+      root["id"] = "1"
+      child = doc.create_element("child")
+      child.text = "data"
+      root.add_child(child)
+
+      doc.root = root
+
+      expect(doc.root.name).to eq("root")
+      expect(doc.root["id"]).to eq("1")
+      expect(doc.root.parent).to eq(doc)
+      expect(doc.to_xml).to include("<root id=\"1\">", "<child>data</child>")
+
+      reparsed = context.parse(doc.to_xml)
+      expect(reparsed.root["id"]).to eq("1")
+      expect(reparsed.at_xpath("//child").text).to eq("data")
+    end
+
+    it "replaces an existing root" do
+      doc = context.parse("<old><nested/></old>")
+      replacement = doc.create_element("new")
+      replacement.add_child("text")
+
+      doc.root = replacement
+
+      expect(doc.root.name).to eq("new")
+      expect(doc.to_xml).to include("<new>text</new>")
+      expect(doc.to_xml).not_to include("old")
+    end
+  end
 end

metadata

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