moxml 0.5.53 → 0.5.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 355fc83dcbe876d6b93a17a347f4f1b406258780780019f8777103fd6ec22460
-  data.tar.gz: 2bad0b067b54079754580eb8c7eedbc78924db32957a2e1c30ac29212a9d2107
+  metadata.gz: ded5e928e12262125965a33ed378e35d8ecc85c3e65de4d514a1fefe0ddd9458
+  data.tar.gz: b86296c3c0402915fc455696b9bd76b7892a08f58ec8fa9d8ac043fcd36784f4
 SHA512:
-  metadata.gz: 5487cedda582d606a358c2d23b1020931deb50b7f200b1cfa3be8b4be12e078129dc0c3a9ec9744afe92c71d7cb89660bdc2a937c9cb1c6d6d0e33127cf17976
-  data.tar.gz: 8f06fd756c4abcf39105f35009cfbba4e0e5f307fbe934c06996818e64585f773562b6c7ebed1be338fee5f84d65459fcabc005c7fea22df5e092ebae06568f9
+  metadata.gz: 8a29c038b4e5290a47acab859cf99796e9b653eb991f12e34539871e3dc8f02a6d3e2c66b312db64d87488a308bbb93f365dd5e4294e75fa329a5bfcb77bb174
+  data.tar.gz: ddfecce2232d70546ed2ac42c9ba5eb000e1d98cee79a00047f0a2927fcb47e40b27b4b35fb282f8086b805428062e664a3652673195e67a6fa7596907579063

data/lib/moxml/adapter/base.rb

@@ -141,6 +141,29 @@ 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
+
         # 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

@@ -463,8 +463,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
@@ -973,7 +992,12 @@ module Moxml
         end
 
         def children(node, entity_bearing: false)
-          if NATIVE_ENTITY_REFS &&
+          # NATIVE_READ_LAYER gates the whole keep-path: it consults
+          # NN_DOCUMENT (defined only with the native layer), and
+          # native-less installs answer through the binding case
+          # branch below, whose children already carry first-class
+          # EntityReference nodes (issue #240).
+          if NATIVE_READ_LAYER && NATIVE_ENTITY_REFS &&
               native_keep_entity_refs?(node)
             return to_binding(node).children.to_a
           end
@@ -1041,7 +1065,8 @@ module Moxml
         end
 
         def native_keep_entity_refs?(node)
-          return false unless node.is_a?(::Leptris::XML::NativeNode)
+          return false unless NATIVE_READ_LAYER &&
+            node.is_a?(::Leptris::XML::NativeNode)
 
           doc = NN_DOCUMENT.bind_call(node)
           attachments.get(doc, :keep_entity_refs) == true

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/version.rb

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

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.53
+  version: 0.5.55
 platform: ruby
 authors:
 - Ribose Inc.