moxml 0.5.143 → 0.5.145

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7ef456b1833d080915877e15238d23fd1e3d38bd638a434711bc98d423b78fc
-  data.tar.gz: 680fe1bbe7097895d5fdb46c29e5e2c624b13ed29792be2ffa941ef3c8bbe3bb
+  metadata.gz: 042f6cd21672a36e869b19c158819a3624d3a79a53de1fd083e83a377b577442
+  data.tar.gz: 7cacbfbd44bb9a87aa252a638b8ac9d25fb5cb67b6e3845c8fdf9c5cf943df24
 SHA512:
-  metadata.gz: 01e458bb31733bbb8a9bf379d37ba30b4d5b30d1670eceffbfad5ae953afa85f1dc272ce3cc99cf719808417a13035dadf00e14fdb6a01d5cce3f4bcc855e8ac
-  data.tar.gz: e0eae403141507dcc8dd23e3b6962935cac3481382ef268a41105ae919e014fc53e657e4b44d261cdb8e59799678dc0a2f1f103937580ee6bb7b8f4e93372667
+  metadata.gz: 507216b5acdf26ae9cd5b4d69c12d2519b949fbe2017c39a804954a04659780c5432b4fe8b11262642ca1699e09eb453af08e230a653a9b530f55404b6d6f5f1
+  data.tar.gz: 5d19c7d3d7e1ad18864d13b0b3eaf69f481b5f1a0c68fd652f29cd9bff4e7b9f95f4adf57698d77849371bc635f9ba3ef36c945f12a1b63e2a350e50fc886bbb

data/lib/moxml/document.rb

@@ -227,7 +227,21 @@ module Moxml
       self
     end
 
+    # Relative name-test paths on the document resolve laxly, as
+    # descendant-or-self anchored at the root — Nokogiri's own
+    # Document#at/#search semantics (moxml#393; its #xpath/#at_xpath are
+    # strict document-context, where the only element child is the root,
+    # and the adapters disagree there anyway: leptris's engine returns []
+    # for every relative path — leptris-ruby#502 — while Nokogiri's
+    # #at/#xpath disagree with each other). Every strict match survives
+    # the lax rewrite (the only strict-matchable first step is the root
+    # itself), so this is purely additive. Non-name-test expressions
+    # (axes, node types, ".", "..") keep document context.
+    RELATIVE_NAME_TEST = /\A\s*(\*|[A-Za-z_][\w.-]*)(\s*\[|\s*\||\z|\/)/
+
     def xpath(expression, namespaces = nil)
+      expression = lax_document_path(expression) if relative_name_test?(expression)
+
       result = adapter.xpath(@native, expression, namespaces)
 
       # Handle different result types:
@@ -246,6 +260,8 @@ module Moxml
     end
 
     def at_xpath(expression, namespaces = nil)
+      expression = lax_document_path(expression) if relative_name_test?(expression)
+
       if (native_node = adapter.at_xpath(@native, expression, namespaces))
         Moxml::Node.wrap(native_node, context)
       end
@@ -268,5 +284,44 @@ module Moxml
     def find_all(xpath)
       xpath(xpath).to_a
     end
+
+    private
+
+    def relative_name_test?(expression)
+      expression.match?(RELATIVE_NAME_TEST)
+    end
+
+    # Anchor every top-level union branch at the document root
+    # ("//"= descendant-or-self): "a/b | c" -> "//a/b | //c" — one
+    # adapter call, engine document order preserved, and the
+    # attribute-terminal idiom (pinned below) stays intact, which the
+    # ".//" form does not (libxml2 rejects .//r/a/@id).
+    def lax_document_path(expression)
+      split_top_level_unions(expression)
+        .map { |branch| "//#{branch.strip}" }
+        .join(" | ")
+    end
+
+    def split_top_level_unions(expression)
+      branches = [+""]
+      depth = 0
+      quote = nil
+      expression.each_char do |ch|
+        if quote
+          quote = nil if ch == quote
+        elsif ["'", '"'].include?(ch)
+          quote = ch
+        elsif ["(", "["].include?(ch)
+          depth += 1
+        elsif [")", "]"].include?(ch)
+          depth -= 1
+        elsif ch == "|" && depth.zero?
+          branches << +""
+          next
+        end
+        branches.last << ch
+      end
+      branches
+    end
   end
 end

data/lib/moxml/version.rb

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

data/spec/consistency/xpath_idioms_spec.rb

@@ -53,9 +53,28 @@ RSpec.describe "XPath idioms across adapters" do
         expect(doc.xpath("//a/@id").first&.value).to eq("x")
         expect(doc.xpath("//@id").first&.value).to eq("x")
         expect(doc.xpath("r/a/@id").first&.value).to eq("x")
-        expect(
-          doc.xpath("//*[local-name()='a']/@id").first&.value,
-        ).to eq("x")
+        expect(doc.xpath("//*[local-name()='a']/@id").first&.value).to eq("x")
+      end
+
+      # moxml#393: a relative name-test path on the DOCUMENT resolves
+      # laxly, descendant-anchored at the root — Nokogiri's own
+      # Document#at/#search semantics, now pinned for every adapter.
+      # Axes, node types and "." keep strict document context.
+      it "resolves document-context relative name-test paths from the root" do
+        doc = ctx.parse(plain_xml)
+        expect(doc.at("a/b")&.name).to eq("b")
+        expect(doc.at_xpath("a/b")&.name).to eq("b")
+        expect(doc.xpath("a/b").map(&:name)).to eq(["b"])
+        expect(doc.xpath("a | r").map(&:name).sort).to eq(%w(a r))
+        expect(doc.xpath("missing").map(&:name)).to eq([])
+        expect(doc.at_xpath("missing")).to be_nil
+      end
+
+      it "keeps non-name-test expressions in document context" do
+        doc = ctx.parse(plain_xml)
+        expect(doc.at_xpath(".")).to be_truthy
+        expect(doc.at_xpath("/*")&.name).to eq("r")
+        expect(doc.at_xpath("/r")&.name).to eq("r")
       end
     end
   end

metadata

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