leptris 1.9.156.1-aarch64-linux → 1.9.156.2-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb036b01691e57c60c3aaf08d3e93be7d6a09e8e50768506ab603d2f341b8b6
-  data.tar.gz: a93e1d24ecfeb4695cfed40ddcda7bb104a82b75b8053d66f528ff8204d35cb3
+  metadata.gz: 80010a60a2c2db3fa067f4dcd34b1bd4285eda3616dde355513b31cf6413bca6
+  data.tar.gz: 819cd39c42877cd843b6ddfea5de5be603c94b5f72a4fb4cd6cef5eb842d4154
 SHA512:
-  metadata.gz: 1d6a8739098a6b04cc2061aa4bc5006f9bcf827c8532638fcdda3bcbec0dfaeca09524cb6bf2ae7238b36f7ce2eb7c8545735c96052a51c594c9ec3fbc32445b
-  data.tar.gz: 5c28a060da7980696d824ecfbed9f2a8349271d5b7e958b2aba92322f5341a7541be1d0c3d345498fb866f940a80a993e07fb0cfda29fc7d6c9e37ec112c0d73
+  metadata.gz: 6b8e1b80577f7a5f6aa33f77ce66d2a5efa4af816e89be7912a69263c06365e17e157d58ab15482a873e9e370bf88ad69b0dcb3b83074af70022c0c24fd2efbd
+  data.tar.gz: 0ab363abd9bd98daccfd95c1c9b4bb75359b9003cb3e5a675671e5a4a2929407ba533d48be95010f430d58a7fe75806e4d56c383ea51acc8767fa1a6c9547732

data/CHANGELOG.md

@@ -5,7 +5,27 @@ All notable changes to Leptris will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.9.156.1] - 2026-09-13
+## [1.9.156.2] - 2026-09-13
+
+### Added
+
+- **#183: XPath version selection** (mirroring leptris-py#105):
+  `xpath`/`at_xpath` take a trailing `version:` selector —
+  `doc.xpath("count(//b)", version: "1.0")` evaluates through the
+  strict 1.0 engine lane (3.x syntax raises), `"3.1"` the full
+  grammar; `XPath.compile(expr, version:)` pins compiled
+  expressions the same way. Carried positionally — a declared
+  keyword is impossible without breaking the namespace-binding
+  hash channel (Ruby converts a trailing String-keyed hash into
+  keywords the moment one exists), so a `:version` key whose
+  VALUE is a version selector ("1.0"/"3.1"/:xpath10/:xpath31)
+  selects the channel; dotted-number values raise at the boundary
+  with the valid values; any other value stays a prefix binding
+  (a prefix literally named "version" keeps working). `version:`
+  combined with namespace bindings raises (the versioned engine
+  entry takes no ns set yet), as does `version:` on css. The nil
+  default keeps the existing eval path verbatim.
+\n## [1.9.156.1] - 2026-09-13
 
 ### Added
 

data/lib/leptris/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Leptris
-  VERSION = "1.9.156.1"
+  VERSION = "1.9.156.2"
 end

data/lib/leptris/xml/searchable.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 module Leptris::XML::Searchable
+  # Values that make a :version key the version channel (#183,
+  # mirroring leptris-py#105); anything else is a namespace prefix.
+  VERSION_SELECTORS = ["1.0", "3.1", :xpath10, :xpath31].freeze
+
   def xpath(*paths)
-    handler, ns, _vars = parse_search_args(paths)
+    handler, ns, version = parse_search_args(paths)
     raise ArgumentError, "custom XPath handlers not supported" if handler
     expr = paths.join(" | ")
 
@@ -10,7 +14,16 @@ module Leptris::XML::Searchable
     context_ptr = is_a?(Leptris::XML::Document) ? nil : c_ptr
 
     result_ptr =
-      if ns && !ns.empty?
+      if version
+        if ns && !ns.empty?
+          raise ArgumentError,
+            "version: cannot be combined with namespace bindings " \
+            "(the versioned engine entry takes no ns set yet)"
+        end
+        Leptris::XML::FFI.leptris_xpath_eval_versioned(
+          doc_ptr, context_ptr, expr,
+          Leptris::XML::Searchable.xpath_version_code(version), nil)
+      elsif ns && !ns.empty?
         xpath_eval_with_namespaces(doc_ptr, context_ptr, expr, ns)
       else
         Leptris::XML::FFI.leptris_xpath_eval(doc_ptr, context_ptr, expr)
@@ -24,7 +37,7 @@ module Leptris::XML::Searchable
   end
 
   def at_xpath(*paths)
-    handler, ns, _vars = parse_search_args(paths)
+    handler, ns, version = parse_search_args(paths)
     raise ArgumentError, "custom XPath handlers not supported" if handler
     expr = paths.join(" | ")
 
@@ -32,7 +45,16 @@ module Leptris::XML::Searchable
     context_ptr = is_a?(Leptris::XML::Document) ? nil : c_ptr
 
     result_ptr =
-      if ns && !ns.empty?
+      if version
+        if ns && !ns.empty?
+          raise ArgumentError,
+            "version: cannot be combined with namespace bindings " \
+            "(the versioned engine entry takes no ns set yet)"
+        end
+        Leptris::XML::FFI.leptris_xpath_eval_versioned(
+          doc_ptr, context_ptr, expr,
+          Leptris::XML::Searchable.xpath_version_code(version), nil)
+      elsif ns && !ns.empty?
         xpath_eval_with_namespaces(doc_ptr, context_ptr, expr, ns)
       else
         Leptris::XML::FFI.leptris_xpath_eval(doc_ptr, context_ptr, expr)
@@ -64,8 +86,9 @@ module Leptris::XML::Searchable
   alias_method :%, :at
 
   def css(*args)
-    handler, ns, _ = parse_search_args(args)
+    handler, ns, version = parse_search_args(args)
     raise ArgumentError, "namespace bindings not supported in css" if ns && !ns.empty?
+    raise ArgumentError, "version: is XPath-only" if version
     raise ArgumentError, "custom CSS handlers not supported" if handler
     # Nokogiri semantics: css is receiver-relative — absolute "//"
     # from a Document, descendant ".//" from elements and fragments.
@@ -76,8 +99,9 @@ module Leptris::XML::Searchable
   end
 
   def at_css(*args)
-    handler, ns, _ = parse_search_args(args)
+    handler, ns, version = parse_search_args(args)
     raise ArgumentError, "namespace bindings not supported in css" if ns && !ns.empty?
+    raise ArgumentError, "version: is XPath-only" if version
     raise ArgumentError, "custom CSS handlers not supported" if handler
     prefix = is_a?(Leptris::XML::Document) ? "//" : ".//"
     expr = args.map { |r| Leptris::XML::CssToXPath.convert(r, prefix: prefix) }
@@ -131,6 +155,15 @@ module Leptris::XML::Searchable
     end
   end
 
+  # Trailing-argument contract (#183): a String-keyed hash is the
+  # namespace-binding channel — as is a Symbol-keyed hash (the
+  # legacy prefix vocabulary, {x: "urn:x"}); a :version key whose
+  # VALUE is a version selector is the version-selection channel
+  # (xpath("//b", version: "1.0"), mirroring leptris-py#105). A
+  # DECLARED keyword cannot carry this: the moment #xpath declares
+  # one, Ruby converts the trailing namespace hash into keywords
+  # (unknown keyword: "p") — so both channels stay positional and
+  # dispatch on key/value here.
   def parse_search_args(args)
     handler = args.find { |a| !a.is_a?(String) && !a.is_a?(Hash) && !a.is_a?(Symbol) }
     args = args - [handler] if handler
@@ -143,7 +176,27 @@ module Leptris::XML::Searchable
     unless vars.nil? || vars.empty?
       raise ArgumentError, "XPath variable bindings are not supported"
     end
-    [handler, ns, vars]
+    # Value-based disambiguation is load-bearing: Symbol keys are
+    # also the namespace vocabulary, and bare keywords FUSE into a
+    # preceding String-keyed hash at the call site ({"p" => uri,
+    # version: "1.0"} arrives as ONE hash). A :version key with any
+    # other value stays a prefix binding.
+    version = nil
+    if ns.is_a?(Hash)
+      v = ns[:version]
+      if VERSION_SELECTORS.include?(v)
+        version = ns.delete(:version)
+        ns = nil if ns.empty?
+      elsif v.is_a?(String) && v.match?(/\A\d+\.\d+\z/)
+        # A dotted-number :version value is version INTENT — raise
+        # with the valid values rather than silently binding a
+        # prefix literally. Genuine prefix bindings carry URIs.
+        raise ArgumentError,
+          "unknown XPath version #{v.inspect} " \
+          "(valid: \"1.0\"/:xpath10, \"3.1\"/:xpath31)"
+      end
+    end
+    [handler, ns, version]
   end
 
   def looks_like_xpath?(str)

data/lib/leptris/xml/xpath.rb

@@ -18,28 +18,44 @@ class Leptris::XML::XPath
 
   attr_reader :expression
 
-  def self.compile(expression)
+  # +version+ (#183, mirroring leptris-py#105): nil compiles the
+  # full-grammar expression (the default); :xpath10 / "1.0" pins
+  # the strict XPath 1.0 surface. Validated at the boundary.
+  def self.compile(expression, version: nil)
     raw = Leptris::XML::FFI.leptris_xpath_compile(expression.to_s)
     if raw.null?
       raise Leptris::XML::XPathError,
         "invalid expression: #{Leptris::XML::FFI.leptris_last_error}"
     end
-    new(expression.to_s, CompiledHandle.new(raw))
+    version_code =
+      Leptris::XML::Searchable.xpath_version_code(version) if version
+    new(expression.to_s, CompiledHandle.new(raw), version_code)
   end
 
-  def initialize(expression, handle)
+  def initialize(expression, handle, version_code = nil)
     @expression = expression
     @handle = handle
+    @version_code = version_code
   end
 
   # Evaluates against +doc_or_element+. An optional trailing hash of
   # namespace bindings ("prefix" => uri) routes the evaluation through
   # the namespace-bound path, matching Searchable#xpath semantics.
+  # A compiled version pin routes through the engine's versioned
+  # entry instead of the compiled handle — there is no compiled
+  # versioned lane yet (engine gap), so the strict-1.0 surface is
+  # enforced per evaluation over the stored expression.
   def eval(doc_or_element, ns = nil)
     context = Leptris::XML::EvaluationContext.of(doc_or_element)
     document = context.document
     result_ptr =
-      if ns && !ns.empty?
+      if @version_code
+        raise ArgumentError,
+          "version: cannot be combined with namespace bindings "           "(the versioned engine entry takes no ns set yet)" if ns && !ns.empty?
+        Leptris::XML::FFI.leptris_xpath_eval_versioned(
+          document.c_ptr, context.context_node_ptr,
+          @expression, @version_code, nil)
+      elsif ns && !ns.empty?
         Leptris::XML::FFI.with_ns_set(ns) do |set|
           Leptris::XML::FFI.leptris_xpath_compiled_eval_ns(
             @handle, document.c_ptr, context.context_node_ptr, set)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leptris
 version: !ruby/object:Gem::Version
-  version: 1.9.156.1
+  version: 1.9.156.2
 platform: aarch64-linux
 authors:
 - Ribose Inc.