moxml 0.5.102 → 0.5.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d182614a13bd3934c6d6dc1bb9b137015dc1daa124aeac24df40246ea3109103
-  data.tar.gz: 51d96b5f964b185772d4378913c5e48e4775c41cf5fd1a3e5cf942576fa33183
+  metadata.gz: 566f2842eac4e01753965cb5f56eada53d6683b3ef6b576015eb4b0da572ae67
+  data.tar.gz: ccc15ef083358a018e1536983017c6681c70c11ccbb4678ac123e5b0b2c9aada
 SHA512:
-  metadata.gz: f4e9ae7331917e4fb295aa541028cb233d889127e4e32982d24ad1d696df668f52d223b70a1c6f2e96360f72138abf36a2eb055f15b9f48c069cb7b421191cfe
-  data.tar.gz: '0362854ca321c56e434a0f030232088d200d948dfe231c2d2cf4d2017c3af7316610e3f18ece3ca85a9a9a2c0d98f431c9f3bb465f186fe39ae23b63ea2e9a7b'
+  metadata.gz: 2c29296b60bedabbc512c9f5c454b0195b3632dbf9952b0c397fc3bad6554135dd3096a04a34e1abddf9ce40088af4856b2ead7d8ca69a4eb251dc3db38286b3
+  data.tar.gz: fd1684a85d2ace2191b33bf996a12e8bea6cb535a340732cccee3318abc6649ba2e07548509d1469959e10ee711ecec650f8ec6b4525beb6a66e2c9a75a81c1d

data/lib/moxml/adapter/leptris.rb

@@ -507,7 +507,37 @@ module Moxml
         raise Moxml::XsltError, "stylesheet compile failed: #{e.message}"
       end
 
+      # Bindings >= 1.9.290.0 thread top-level xsl:param overrides
+      # (leptris#1478); older bindings raise the typed error (the
+      # #360 face gap, face-probed so a misrelease degrades instead
+      # of NoMethodError-ing — the 1.9.199.0 lesson).
+      NATIVE_XSLT_PARAMS =
+        NATIVE_READ_LAYER &&
+        Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.290.0") &&
+        ::Leptris::XML::XSLT::Stylesheet.instance_method(:apply_to)
+          .parameters.size > 1
+
+      # The seam contract passes the libxslt flat quoted array; the
+      # binding wants the raw name => value hash (leptris#1478
+      # matches nokogiri's quoted-string semantics internally).
+      def self.flat_params_to_hash(params)
+        return params if params.is_a?(Hash)
+        return {} if params.nil? || params.empty?
+
+        params.each_slice(2).to_h { |name, value| [name, unquote_param(value)] }
+      end
+
+      def self.unquote_param(value)
+        str = value.to_s
+        str.start_with?("'") && str.end_with?("'") && str.length >= 2 ? str[1..-2] : str
+      end
+
       def self.xslt_apply_document(sheet, document_native, params)
+        if NATIVE_XSLT_PARAMS
+          return sheet.apply_to(document_native,
+                                params: flat_params_to_hash(params))
+        end
+
         assert_xslt_no_params(params)
         sheet.apply_to(document_native)
       rescue ::Leptris::XML::XPathError => e
@@ -515,6 +545,11 @@ module Moxml
       end
 
       def self.xslt_apply_string(sheet, document_native, params)
+        if NATIVE_XSLT_PARAMS
+          return sheet.serialize(document_native,
+                                 params: flat_params_to_hash(params))
+        end
+
         assert_xslt_no_params(params)
         sheet.serialize(document_native)
       rescue ::Leptris::XML::XPathError => e
@@ -525,8 +560,9 @@ module Moxml
         return if params.nil? || params.empty?
 
         raise Moxml::XsltError,
-              "XSLT params are not threaded by the leptris engine yet " \
-              "(leptris-ruby#360); pass an empty params hash"
+              "XSLT params are not threaded by this binding " \
+              "(leptris-ruby#360); upgrade to leptris >= 1.9.290.0 or " \
+              "pass an empty params hash"
       end
 
       def self.native_c14n_byte_safe?
@@ -2016,11 +2052,23 @@ module Moxml
           new_node
         end
 
+        NATIVE_APPEND_CHILDREN =
+          NATIVE_READ_LAYER &&
+          Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.290.0")
+
         def replace_children(node, new_children)
           if NATIVE_READ_LAYER
             node = to_binding(node)
             new_children = new_children.map { |child| to_binding(child) }
           end
+          if NATIVE_APPEND_CHILDREN && !new_children.empty?
+            # One crossing to clear, one to append N (leptris-ruby#366's
+            # bulk face; the old path paid an append crossing per child).
+            ::Leptris::XML::FFI.check_status(
+              ::Leptris::XML::FFI.leptris_element_remove_children(node.c_ptr),
+            )
+            return node.append_children(new_children)
+          end
           node.children = new_children
         end
 

data/lib/moxml/version.rb

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

data/spec/moxml/xslt/stylesheet_spec.rb

@@ -4,8 +4,9 @@ require "spec_helper"
 
 # The Moxml::XSLT contract: compile once, apply many. Only engines
 # with an XSLT processor implement it (nokogiri/libxslt; leptris
-# covering XSLT 1.0-3.0). leptris does not thread top-level params
-# yet (leptris-ruby#360) — non-empty params raise Moxml::XsltError.
+# covering XSLT 1.0-3.0). Bindings >= 1.9.290.0 thread top-level
+# params (leptris#1478); older bindings raise Moxml::XsltError
+# citing leptris-ruby#360.
 SHEET_COUNT = <<~XSL
   <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
     <xsl:template match="/"><out><xsl:value-of select="count(//i)"/></out></xsl:template>
@@ -77,10 +78,22 @@ RSpec.describe "Moxml::XSLT" do
       expect(sheet.apply_to_string(doc)).to include("plain text result")
     end
 
-    it "raises XsltError on non-empty params (leptris-ruby#360)" do
-      sheet = ctx.xslt(SHEET_COUNT)
-      expect { sheet.apply_to(doc, params: { "n" => "7" }) }
-        .to raise_error(Moxml::XsltError, /params.*#360/)
+    if Gem::Version.new(Leptris::VERSION) >= Gem::Version.new("1.9.290.0")
+      it "threads top-level params (leptris#1478)" do
+        sheet = ctx.xslt(<<~XSL)
+          <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+            <xsl:param name="n" select="'0'"/>
+            <xsl:template match="/"><out><xsl:value-of select="$n"/></out></xsl:template>
+          </xsl:stylesheet>
+        XSL
+        expect(sheet.apply_to_string(doc, params: { "n" => "7" })).to include("7")
+      end
+    else
+      it "raises XsltError on non-empty params (leptris-ruby#360)" do
+        sheet = ctx.xslt(SHEET_COUNT)
+        expect { sheet.apply_to(doc, params: { "n" => "7" }) }
+          .to raise_error(Moxml::XsltError, /params.*#360/)
+      end
     end
 
     it "reports support" do

metadata

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