moxml 0.5.93 → 0.5.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92d24efac79874e02cbfa26e20fc8135e2a714020a727896cdf2a460fa7d0508
-  data.tar.gz: 91f18637388f6983c2c75c606e95e93f15919b3099fbdc0c8e59ebf9aca93d5e
+  metadata.gz: e54a93041f955c95affa2211704839bfaf47dafc0908cd73b58012946ffe99f1
+  data.tar.gz: 4d28d6376f61ae7441e13075ac5e9433bd18b6c393cf95afe363a639a4b8d251
 SHA512:
-  metadata.gz: 91cd7d93def6717a7eedf675e871ff7d05d3dfb5378f8ddbe8f839daa68d0d1dbe0e1bdf6bdb939704bb03f673950c9faa858265321e2a209fbcb2042224a3cd
-  data.tar.gz: c973d0559eb5fcc42f45dfb824758cdbec8758ec0dc378a4ce4034d918b3b50fcdada1120cd9f18b47c39a42055d4cd810225588dbcf598346c920a2a510e0c7
+  metadata.gz: 3e13a34f69a9e91b18d7fc9cef1e30c40ced24c8c73b322459ecba15af568439b002db8eec51097af2188571d026bfae7861646cc33077127c1fbd570b179863
+  data.tar.gz: a873c43e7ee3ccffc1997bf103263b7848d8ed17c61e25322a8d550bdf62a46d2f1e9e4a93f6e2832484a6df9d93350fd53d833a0b48ce04e1247583fc447d50

data/lib/moxml/adapter/leptris.rb

@@ -1942,7 +1942,14 @@ module Moxml
         end
 
         def processing_instruction_content(node)
-          return NN_CONTENT.bind_call(node) if NATIVE_READ_LAYER && node.is_a?(NN)
+          if NATIVE_READ_LAYER && node.is_a?(NN)
+            content = NN_CONTENT.bind_call(node)
+            # NativeNode#content answers nil for PI-kind nodes too
+            # (leptris-ruby#344 covers comments); bridge for the data.
+            return to_binding(node).content if content.nil?
+
+            return content
+          end
 
           node.content
         end

data/lib/moxml/c14n/data_model.rb

@@ -237,7 +237,9 @@ module Moxml
       # included element renders with its namespaces, attributes and
       # DIRECT character data, but child ELEMENTS render only if
       # matched too — an unmatched Signature subtree stays out even
-      # though its ancestors are matched.
+      # though its ancestors are matched. Comments and PIs render
+      # only when the expression itself selects them (spec §3: the
+      # node-set is literal).
       def self.mark_subset_paths(root_node, paths)
         mark_all(root_node, false)
         paths.each do |path|
@@ -249,7 +251,7 @@ module Moxml
             node.namespace_nodes.each { |ns| ns.in_node_set = true }
             node.attribute_nodes.each { |attr| attr.in_node_set = true }
             node.children.each do |child|
-              child.in_node_set = true unless child.is_a?(Nodes::ElementNode)
+              child.in_node_set = true if child.is_a?(Nodes::TextNode)
             end
           else
             node.in_node_set = true

data/lib/moxml/version.rb

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

data/spec/moxml/c14n/subset_spec.rb

@@ -31,12 +31,21 @@ CORPUS = [
 ].freeze
 
 COMMENTS_CASE = [
-  "with_comments keeps matched comments only",
+  "with_comments renders explicitly selected comments only",
+  %(<a><!-- keep --><b><!-- in --><c/></b></a>), "//b | //comment()",
+  %(<!-- keep -->\n<b><!-- in --></b>)
+].freeze
+
+COMMENTS_EXCLUDED_CASE = [
+  "unselected comments stay out",
   %(<a><!-- keep --><b><!-- in --><c/></b></a>), "//b",
-  %(<b><!-- in --></b>)
+  %(<b></b>)
 ].freeze
 
 COMMENTS_PADDING_LOSS = %i[ox headed_ox].freeze
+# rexml's adapter xpath does not return comment()/text() node results
+# (pre-existing capability gap, same family for both axes).
+COMMENT_SELECTION_GAP = %i[rexml].freeze
 
 RSpec.describe "Moxml::C14n subset canonicalization" do
   # Node-set semantics follow the enveloped-signature interop
@@ -63,8 +72,11 @@ RSpec.describe "Moxml::C14n subset canonicalization" do
         end
 
         # ox/headed_ox strip comment content padding at the parse
-        # layer (pre-existing, same family as their PI content loss).
-        unless COMMENTS_PADDING_LOSS.include?(adapter_name)
+        # layer (pre-existing, same family as their PI content loss);
+        # only the rendered-comment case depends on it. rexml's
+        # comment() selection gap also only affects this case.
+        unless COMMENTS_PADDING_LOSS.include?(adapter_name) ||
+            COMMENT_SELECTION_GAP.include?(adapter_name)
           it COMMENTS_CASE[0] do
             doc = ctx.parse(COMMENTS_CASE[1])
             expect(Moxml::C14n.canonicalize_subset(doc, COMMENTS_CASE[2],
@@ -72,6 +84,13 @@ RSpec.describe "Moxml::C14n subset canonicalization" do
               .to eq(COMMENTS_CASE[3])
           end
         end
+
+        it COMMENTS_EXCLUDED_CASE[0] do
+          doc = ctx.parse(COMMENTS_EXCLUDED_CASE[1])
+          expect(Moxml::C14n.canonicalize_subset(doc, COMMENTS_EXCLUDED_CASE[2],
+                                                 with_comments: true))
+            .to eq(COMMENTS_EXCLUDED_CASE[3])
+        end
       end
     end
   end

data/spec/moxml/c14n/w3c_examples_spec.rb

@@ -0,0 +1,104 @@
+# frozen_string: true
+
+require "spec_helper"
+require "moxml/c14n"
+
+# Shapes drawn from the W3C Canonical XML 1.0 REC examples (§2–§3):
+# attribute-value whitespace normalization, character-reference CR
+# preservation vs literal-CR folding, CDATA as character data, empty
+# element form, PI/comment placement, and the §3 document-subset
+# whitespace rules. Expected bytes are the forms all conformant
+# adapters answer identically.
+#
+# Documented parse-layer divergences (skipped rows):
+# - ox/headed_ox expand 
 to LF, strip inter-element whitespace
+#   and comment padding at parse (out of scope here)
+# - oga keeps the target/content separator space in PI data
+W3C_FULL_FORMS = [
+  ["attribute-value whitespace collapses to single spaces",
+   "<doc>\n   <e   attr1=\"v1\"\n        attr2   =   \"v2\"\n    >   content   </e>\n</doc>",
+   "<doc>\n   <e attr1=\"v1\" attr2=\"v2\">   content   </e>\n</doc>"],
+  ["character-reference CR stays &#xD;; literal CR folds to LF",
+   %(<doc>a&#xD;b\nc&#xA;d</doc>),
+   %(<doc>a&#xD;b\nc\nd</doc>)],
+  ["CDATA is character data and escapes",
+   %(<doc><![CDATA[a<b]]> &amp; &lt; x</doc>),
+   %(<doc>a&lt;b &amp; &lt; x</doc>)],
+  ["empty elements render as start and end tags",
+   %(<doc><e/><f></f></doc>),
+   "<doc><e></e><f></f></doc>"],
+  ["PIs render in place; comments drop without with_comments",
+   %(<doc><?pi c?><!-- c1 --><e/><!-- c2 --></doc>),
+   %(<doc><?pi c?><e></e></doc>)],
+].freeze
+
+W3C_SUBSET_FORM = [
+  %(<doc>\n   <e1 a="1" b="2"/>\n   <e2/>\n   <e3/>\n   <!-- A small comment -->\n   <?pi x?>\n</doc>),
+  "//e1 | //e2 | //e3",
+  %(<e1 a="1" b="2"></e1><e2></e2><e3></e3>),
+].freeze
+
+W3C_SUBSET_WITH_ROOT = [
+  %(<doc>\n   <e1 a="1" b="2"/>\n   <e2/>\n   <e3/>\n   <!-- A small comment -->\n   <?pi x?>\n</doc>),
+  "/doc | //e1 | //e2 | //e3",
+  %(<doc>\n   <e1 a="1" b="2"></e1>\n   <e2></e2>\n   <e3></e3>\n   \n   \n</doc>),
+].freeze
+
+CR_SHAPE = 1
+PI_SHAPE = 4
+WHITESPACE_SHAPES = %i[ox headed_ox].freeze
+
+RSpec.describe "Moxml::C14n W3C REC-xml-c14n examples" do
+  Moxml::Adapter::AVAILABLE_ADAPTERS.each do |adapter_name|
+    context "with the #{adapter_name} adapter" do
+      let(:ctx) { Moxml.new(adapter_name) }
+
+      W3C_FULL_FORMS.each_with_index do |(label, xml, expected), idx|
+        # ox/headed_ox strip inter-element whitespace, expand &#xD;
+        # and pad comments at parse; oga keeps the PI separator space.
+        skip_shapes = { ox: [0, CR_SHAPE, PI_SHAPE],
+                        headed_ox: [0, CR_SHAPE, PI_SHAPE],
+                        oga: [PI_SHAPE] }[adapter_name] || []
+        next if skip_shapes.include?(idx)
+
+        it "canonicalizes #{label}" do
+          doc = ctx.parse(xml)
+          expect(Moxml::C14n.canonicalize_inclusive10(doc)).to eq(expected)
+          expect(Moxml::C14n.canonicalize(doc.root)).to eq(expected)
+        end
+      end
+    end
+  end
+
+  describe "W3C §3 document-subset whitespace" do
+    Moxml::Adapter::AVAILABLE_ADAPTERS.each do |adapter_name|
+      next if WHITESPACE_SHAPES.include?(adapter_name)
+
+      it "renders selected nodes only, whitespace runs in place (#{adapter_name})" do
+        doc = Moxml.new(adapter_name).parse(W3C_SUBSET_FORM[0])
+        expect(Moxml::C14n.canonicalize_subset(doc, W3C_SUBSET_FORM[1]))
+          .to eq(W3C_SUBSET_FORM[2])
+      end
+
+      it "keeps the root's whitespace runs when the root is selected (#{adapter_name})" do
+        doc = Moxml.new(adapter_name).parse(W3C_SUBSET_WITH_ROOT[0])
+        expect(Moxml::C14n.canonicalize_subset(doc, W3C_SUBSET_WITH_ROOT[1]))
+          .to eq(W3C_SUBSET_WITH_ROOT[2])
+      end
+    end
+  end
+
+  describe "Ruby reference agrees with the native engines" do
+    %i[leptris nokogiri].each do |adapter_name|
+      next unless Moxml::Adapter::AVAILABLE_ADAPTERS.include?(adapter_name)
+
+      it "on every full-document shape (#{adapter_name})" do
+        W3C_FULL_FORMS.each do |_label, xml, _expected|
+          root = Moxml.new(adapter_name).parse(xml).root
+          expect(Moxml::C14n.canonicalize(root))
+            .to eq(Moxml::C14n.canonicalize_inclusive10(root))
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.5.93
+  version: 0.5.94
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-28 00:00:00.000000000 Z
+date: 2026-09-30 00:00:00.000000000 Z
 dependencies: []
 description: |
   Moxml is a unified XML manipulation library that provides a common API
@@ -464,6 +464,7 @@ files:
 - spec/moxml/c14n/inclusive10_spec.rb
 - spec/moxml/c14n/namespace_edge_cases_spec.rb
 - spec/moxml/c14n/subset_spec.rb
+- spec/moxml/c14n/w3c_examples_spec.rb
 - spec/moxml/c14n/xml_attributes_spec.rb
 - spec/moxml/cdata_spec.rb
 - spec/moxml/comment_spec.rb