moxml 0.5.54 → 0.5.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba51d35ca414232eb04fafd976a2f5d24b2f43fff1b0e4c4a69147162da324c7
-  data.tar.gz: 73df7c7f9da2ff33e4ab2d06f3b56b29b0a09e4784c78eb9907d3ec15f82c234
+  metadata.gz: 30ad2e1e2f91d4d31eb467d5a2beee85bc3112585d6383bf37b0a66e6d1bca40
+  data.tar.gz: ff7ef79362aa97205ce0b16c7161a9c5d7f25720a3794a967cfb9dbf4afa3a5e
 SHA512:
-  metadata.gz: c30f3bef444d6a6da7416e5ee5493c5656a6bbca1f28c9d504c9405b3be54b083eb5bf9a218ed1e0ac1cb94b3551678c028adadf667fcc7b15b50a2e403341ab
-  data.tar.gz: cef805979f7168ec08ce5dc80624e74a2bef27225233d1389862d84b6d4d9cea56806b50a6231e078a626ba488ce90668e0fd8b40ad6cf11a650a3b154c24041
+  metadata.gz: 580fe3a426ebf5d37017fa727527518a76e2221c34543e58c22a08c41d92300e23dbc8bfc391d7f39b09ffd9b78921b1434dc2a51154af4e507e2be409935e08
+  data.tar.gz: 15cbb5eb0ca6795715aea82f2b05e017c6d5726c0b6e814713955aa4da0c7e045b21afd9304b7fd1bfdc1cc685f9b45ee743d80f5e06025770218ae383d76060

data/Gemfile

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

data/lib/moxml/adapter/base.rb

@@ -141,6 +141,37 @@ module Moxml
           nil
         end
 
+        # Prefixed-attribute value fast path: adapters whose engine
+        # resolves expanded-name (uri, local) lookups natively answer
+        # the value here; others fall back to the resolver's
+        # attribute-list match. Capability probe, not a class
+        # identity check — Moxml::Adapter::Leptris is only defined
+        # once that adapter loads (issue #242).
+        def expanded_attr_reads?
+          false
+        end
+
+        def expanded_attr_value(_element, _uri, _local)
+          nil
+        end
+
+        # Engine-side inclusive C14N delegation: adapters whose
+        # engine canonicalizes byte-identically to the Ruby reference
+        # answer the String here; others (and unsupported shapes)
+        # return nil and the Ruby reference runs. Capability probe —
+        # same reasoning as expanded_attr_reads? (issue #242).
+        def native_inclusive10(_native)
+          nil
+        end
+
+        # Source position {line, col_start, col_end} for a node where
+        # the engine exposes it (leptris 1.9.181+ source_position);
+        # nil elsewhere and for nodes without a position (created
+        # nodes answer zeros upstream — pass those through as-is).
+        def source_position(_native)
+          nil
+        end
+
         # Subtree walk capability: an adapter with a C-side pre-order
         # traversal (leptris >= 1.9.174.6 visit) walks descendants in
         # one dispatch; nil keeps the recursive children walk. Self

data/lib/moxml/adapter/leptris.rb

@@ -103,6 +103,12 @@ module Moxml
         NN_ADD_CHILD = NN.instance_method(:add_child)
       end
 
+      # 1.9.181 (lockstep): Node#source_position — {line, col_start,
+      # col_end} from the engine's source-position API (upstream
+      # #1124); created nodes report zeros.
+      NATIVE_SOURCE_POSITION =
+        Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.181")
+
       # Entity-reference preservation (leptris-ruby#212 / upstream
       # #1094): 1.9.177 ships ParseOptions.keep_entity_refs plus
       # first-class EntityReference nodes — the marker machinery
@@ -463,8 +469,27 @@ module Moxml
         # engine — the same match rule as the resolver (xmlns
         # declarations invisible, no-namespace never matches a
         # prefixed name), without materializing the attribute list.
+        def expanded_attr_reads?
+          true
+        end
+
+        def native_inclusive10(native)
+          return nil unless native_c14n_byte_safe?
+
+          to_binding(native).canonicalize(
+            ::Leptris::XML::FFI::C14N_1_0, nil,
+            mode: ::Leptris::XML::FFI::C14N_MODE_CANONICAL
+          )
+        end
+
         def expanded_attr_value(element, uri, local)
-          element.attribute_ns(uri, local)
+          # Bridge first: identity-mode wrappers hand a NativeNode
+          # (no attribute_ns); binding elements pass through as-is.
+          # The class-receiver is_a? this method replaced was always
+          # false — element.adapter IS the adapter class — so the
+          # branch sat dead since identity mode and the binding-only
+          # assumption went unnoticed (issue #242).
+          to_binding(element).attribute_ns(uri, local)
         end
 
         # Fast bare-name read: the binding call plus marker
@@ -1219,6 +1244,12 @@ module Moxml
           r
         end
 
+        def source_position(node)
+          return nil unless NATIVE_SOURCE_POSITION
+
+          to_binding(node).source_position
+        end
+
         def line_number(node)
           if NATIVE_MUTATIONS_COHERENT &&
               node.is_a?(::Leptris::XML::NativeNode)

data/lib/moxml/attribute_resolver.rb

@@ -42,9 +42,7 @@ module Moxml
       return nil if uri.nil?
 
       adapter = element.adapter
-      if adapter.is_a?(Moxml::Adapter::Leptris)
-        return adapter.expanded_attr_value(element.native, uri, local)
-      end
+      return adapter.expanded_attr_value(element.native, uri, local) if adapter.expanded_attr_reads?
 
       attr = resolve(element, name)
       attr&.value

data/lib/moxml/c14n.rb

@@ -62,14 +62,7 @@ module Moxml
       return nil if with_comments || !inclusive_namespaces.empty?
       return nil unless algorithm_shape_inclusive10?(node_or_xml)
 
-      adapter = node_or_xml.context.config.adapter
-      return nil unless adapter == Moxml::Adapter::Leptris &&
-        Moxml::Adapter::Leptris.native_c14n_byte_safe?
-
-      Moxml::Adapter::Leptris.to_binding(node_or_xml.native).canonicalize(
-        ::Leptris::XML::FFI::C14N_1_0, nil,
-        mode: ::Leptris::XML::FFI::C14N_MODE_CANONICAL
-      )
+      node_or_xml.context.config.adapter.native_inclusive10(node_or_xml.native)
     end
 
     def self.algorithm_shape_inclusive10?(node_or_xml)

data/lib/moxml/node.rb

@@ -402,6 +402,14 @@ module Moxml
       adapter.line_number(@native)
     end
 
+    # {line, col_start, col_end} where the engine exposes source
+    # positions (leptris 1.9.181+); nil elsewhere. Created nodes
+    # answer zeros upstream — distinguishable from nil by callers
+    # that care.
+    def source_position
+      adapter.source_position(@native)
+    end
+
     # Content-defined Merkle digest of this subtree (issue #173,
     # companion to leptris#869): a u64 Integer where the backend
     # computes one, nil everywhere else. Consumers gate on nil and

data/lib/moxml/version.rb

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

data/spec/moxml/adapter/leptris_spec.rb

@@ -694,6 +694,25 @@ RSpec.describe Moxml::Adapter::Leptris do
     end
   end
 
+  describe "source_position (leptris 1.9.181+, upstream #1124)" do
+    let(:ctx) { Moxml.new(:leptris) }
+
+    it "answers engine source positions for parsed nodes" do
+      skip "requires leptris 1.9.181" unless described_class::NATIVE_SOURCE_POSITION
+
+      doc = ctx.parse("<root>\n  <child>text</child>\n</root>")
+      expect(doc.root.source_position).to include(line: 1)
+      expect(doc.root.source_position).to be_a(Hash)
+    end
+
+    it "answers nil below the gate and on other adapters" do
+      expect(Moxml::Adapter::Base.source_position(nil)).to be_nil
+      expect(Moxml::Adapter::Nokogiri.source_position(nil)).to be_nil
+      noko = Moxml.new(:nokogiri).parse("<root><a/></root>")
+      expect(noko.root.children.first.source_position).to be_nil
+    end
+  end
+
   describe "subtree digest (issue #173, leptris#869)" do
     let(:ctx) { Moxml.new(:leptris) }
 

data/spec/moxml/attribute_resolver_spec.rb

@@ -105,4 +105,22 @@ RSpec.describe Moxml::AttributeResolver do
              )).to be(false)
     end
   end
+
+  describe ".resolve_value capability dispatch (issue #242)" do
+    it "answers prefixed values through the adapter capability, not class identity" do
+      doc = Moxml.new(:nokogiri).parse(
+        '<w:f xmlns:w="urn:w"><w:n w:val="Arial"/></w:f>',
+      )
+      node = doc.root.children.first
+
+      expect(Moxml::Adapter::Base.expanded_attr_reads?).to be(false)
+      expect(Moxml::Adapter::Nokogiri.expanded_attr_reads?).to be(false)
+      expect(node["w:val"]).to eq("Arial")
+    end
+
+    it "keeps native c14n delegation behind the adapter protocol" do
+      expect(Moxml::Adapter::Base.native_inclusive10(nil)).to be_nil
+      expect(Moxml::Adapter::Nokogiri.native_inclusive10(nil)).to be_nil
+    end
+  end
 end

metadata

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