moxml 0.5.42 → 0.5.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d447f74ea4b1c546e83fbb94819c6043a1fa48e0f9932ac7202009cecff63e1e
-  data.tar.gz: 4c33c0af41d9c628ecc993d7015d4e827d1d451b266dd7ad4145f00b322670a3
+  metadata.gz: cd5c99b547004d2f6521f882b006da2b612ee74cabf92775a3b061d9f096bc20
+  data.tar.gz: 652bce88c043068ecd97ef7008044557f764661a2e792f1128d435d4e83d715a
 SHA512:
-  metadata.gz: ebdc376975c3893facd06d793a04eebdfa9387814b131b9f0c5aecbd047fb57dcfadba80c40eee8ff60e52b4a7cbf1e886e67909b5f9b46623ca91b75cdb04b5
-  data.tar.gz: 9cf48a7154d6336a24504df0ec1cd62d689859f1b8f9df85e313bf69f1db97a17191e813b7f2e10bdd8565644dae88f6b323b1cd109e64995e26ea8d537bb67a
+  metadata.gz: ba8297809db361e15cac3cbfbc132aa5545ceee6fe4e3d8b7df9a6250e7585ce930eaf7ba7d15de155975848f0d2deb205dcf8b0ebbdd3e00d96cbfc8d758633
+  data.tar.gz: 982406a0ff5f858aeed1569fd4ca1d4536bbb2b9841d791b4f560475b19b77641db0831fac7efd6760c3493216a9db8635de55d5e146f158cc0f16297fc97895

data/Gemfile

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

data/lib/moxml/adapter/leptris.rb

@@ -42,6 +42,17 @@ module Moxml
       DIGEST_SUPPORTED =
         Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.99")
 
+      # 1.9.163.7 added the XPath seams (TODO.perf/15+16):
+      # Searchable#at_xpath materializes nodeset entry 0 and frees
+      # the handle in one C dispatch — no NodeSet container, no
+      # AutoPointer (2.8x on repeat at_xpath) — and
+      # CompiledXPath#eval_ptrs runs the compiled handle against
+      # raw pointers, skipping the per-call EvaluationContext
+      # (~2us on every multi-result query).
+      NATIVE_XPATH_SEAMS =
+        defined?(::Leptris::XML::Native) &&
+        Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.163.7")
+
       # Opt-in native read layer (leptris-ruby#185, bindings >= 1.9.162.6):
       # TypedData node wrappers with C-bound hot reads and bulk
       # children construction. Minted from #root downward; the C
@@ -89,7 +100,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
@@ -98,11 +119,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
 
@@ -281,7 +305,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?
@@ -1290,6 +1314,9 @@ module Moxml
         # cached AST three times per xpath call cost ~23% of repeated
         # selective queries, so the boolean caches beside it.
         NATIVE_GATE_CACHE = XPath::Cache.new(100)
+        # Root-context queries alone take the parent-axis guard; the
+        # AST walk is per-expression, so the verdict caches too.
+        PARENT_AXIS_CACHE = XPath::Cache.new(100)
 
         def xpath(node, expression, namespaces = {})
           node = to_binding(node) if NATIVE_READ_LAYER
@@ -1310,6 +1337,14 @@ module Moxml
         # @return [Array, Object, nil] native results, or nil when the
         #   query must run on the Ruby engine
         def native_xpath(node, expression, namespaces, first_only: false)
+          # Canonical natives (the #219 unification) are bare TypedData
+          # wrappers — no Searchable methods, no document handle for
+          # the gates below. The memoized bridge recovers the binding
+          # identity; without it every element-context query fell to
+          # the Ruby engine (a silent native-path loss since #219).
+          if NATIVE_READ_LAYER && node.is_a?(::Leptris::XML::NativeNode)
+            node = to_binding(node)
+          end
           return nil unless native_context_node?(node)
           return nil unless native_expression?(expression)
           # The binding reports the root element parentless while moxml
@@ -1317,27 +1352,70 @@ module Moxml
           # root element keep the Ruby engine.
           if node.is_a?(::Leptris::XML::Element) &&
               node.document&.root.equal?(node) &&
-              expression_uses_parent_axis?(expression)
+              PARENT_AXIS_CACHE.get_or_set(expression) do
+                expression_uses_parent_axis?(expression)
+              end
             return nil
           end
 
           compiled = NATIVE_XPATH_CACHE.get_or_set(expression) do
             ::Leptris::XML::XPath.compile(expression)
           end
-          result = if namespaces && !namespaces.empty?
-                     compiled.eval(node, namespaces)
+          document = node.is_a?(::Leptris::XML::Document) ? node : node.document
+
+          if namespaces && !namespaces.empty?
+            # Namespace-bound evaluation has no raw-pointer entry —
+            # Searchable resolves the ns set for both result shapes.
+            result = if first_only
+                       node.at_xpath(expression, namespaces)
+                     else
+                       compiled.eval(node, namespaces)
+                     end
+            return case result
+                   when ::Leptris::XML::NodeSet
+                     first_only ? result.first : result.extend(Moxml::LazyNodeSet)
                    else
-                     compiled.eval(node)
+                     result
+                   end
+          end
+
+          unless NATIVE_XPATH_SEAMS
+            result = compiled.eval(node)
+            return case result
+                   when ::Leptris::XML::NodeSet
+                     first_only ? result.first : result.extend(Moxml::LazyNodeSet)
+                   else
+                     result
                    end
-          case result
-          when ::Leptris::XML::NodeSet
-            # The binding's #to_a mints one Ruby wrapper per result
-            # node; hand the native set through so .size/.first stay
-            # native-side (LazyNodeSet holds it unmaterialized).
-            first_only ? result.first : result.extend(Moxml::LazyNodeSet)
-          else
-            result
           end
+
+          # eval_ptrs against raw pointers — the per-call
+          # EvaluationContext that #eval builds costs ~2us of Ruby
+          # on every query (leptris-ruby TODO.perf/15).
+          doc_ptr = node.is_a?(::Leptris::XML::Document) ? node.c_ptr : document.c_ptr
+          context_ptr = node.is_a?(::Leptris::XML::Document) ? nil : node.c_ptr
+          result_ptr = compiled.eval_ptrs(doc_ptr, context_ptr)
+          return nil if result_ptr.null?
+
+          if first_only
+            # The single-result seam: nodeset entry 0 materializes
+            # and frees in one C dispatch — no NodeSet container, no
+            # AutoPointer (leptris-ruby TODO.perf/16). The module
+            # object back means a scalar, whose wrap (and free)
+            # stays with wrap_xpath_first_result.
+            return ::Leptris::XML::Searchable.wrap_xpath_first_result(
+              document, result_ptr
+            )
+          end
+
+          # The binding's #to_a mints one Ruby wrapper per result
+          # node; hand the native set through so .size/.first stay
+          # native-side (LazyNodeSet holds it unmaterialized).
+          # Scalars pass through unwrapped-and-unextended.
+          result = ::Leptris::XML::Searchable.wrap_xpath_result(
+            document, result_ptr
+          )
+          result.is_a?(::Leptris::XML::NodeSet) ? result.extend(Moxml::LazyNodeSet) : result
         rescue ::Leptris::XML::XPathError
           # Not supported by the native engine — the Ruby engine is a
           # full XPath 1.0 implementation, including Moxml's syntax

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.42"
+  VERSION = "0.5.44"
 end

data/lib/moxml/xpath/cache.rb

@@ -11,8 +11,12 @@ module Moxml
       # @param [Integer] max_size Maximum number of entries to cache
       def initialize(max_size = DEFAULT_SIZE)
         @max_size = max_size
-        @cache = {}
-        @access_order = []
+        # One insertion-ordered hash: re-inserting a key on access
+        # makes the first entry the least-recently-used. An
+        # Array-backed order list cost ~600ns per hit in O(n)
+        # deletes — the adapter's xpath path hits three caches per
+        # call.
+        @entries = {}
       end
 
       # Gets a value from the cache or sets it using the provided block.
@@ -21,11 +25,9 @@ module Moxml
       # @yield Block to execute if key is not in cache
       # @return [Object] Cached or newly computed value
       def get_or_set(key)
-        if @cache.key?(key)
-          # Move to end (most recently used)
-          @access_order.delete(key)
-          @access_order.push(key)
-          @cache[key]
+        if @entries.key?(key)
+          value = @entries.delete(key)
+          @entries[key] = value
         else
           value = yield
           set(key, value)
@@ -39,16 +41,9 @@ module Moxml
       # @param [Object] value
       # @return [Object] The value
       def set(key, value)
-        if @cache.key?(key)
-          @access_order.delete(key)
-        elsif @cache.size >= @max_size
-          # Remove least recently used
-          lru_key = @access_order.shift
-          @cache.delete(lru_key)
-        end
-
-        @cache[key] = value
-        @access_order.push(key)
+        @entries.delete(key)
+        @entries[key] = value
+        @entries.shift if @entries.size > @max_size
         value
       end
 
@@ -57,26 +52,24 @@ module Moxml
       # @param [Object] key
       # @return [Object, nil]
       def get(key)
-        return unless @cache.key?(key)
+        return unless @entries.key?(key)
 
-        @access_order.delete(key)
-        @access_order.push(key)
-        @cache[key]
+        value = @entries.delete(key)
+        @entries[key] = value
       end
 
       # Clears the cache.
       #
       # @return [void]
       def clear
-        @cache.clear
-        @access_order.clear
+        @entries.clear
       end
 
       # Returns the current size of the cache.
       #
       # @return [Integer]
       def size
-        @cache.size
+        @entries.size
       end
 
       # Checks if a key exists in the cache.
@@ -84,7 +77,7 @@ module Moxml
       # @param [Object] key
       # @return [Boolean]
       def key?(key)
-        @cache.key?(key)
+        @entries.key?(key)
       end
     end
   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.42
+  version: 0.5.44
 platform: ruby
 authors:
 - Ribose Inc.