moxml 0.5.26 → 0.5.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7d4ecc2bb794f60a6b240faf3828c7847da9eebf8d45e44b35dd863f8ef7b09
-  data.tar.gz: 04d2ecbc979863a35825a8ba95a7897d4f7d395629c5ca959dfa8fd96c71a662
+  metadata.gz: c393ef51976af7e0ccf0ff232d009863a0b2b7be044b70e8500beedb216bd122
+  data.tar.gz: 1718f58a399c09fc218b269faa62dbd52e50e2bbdcdea32e52f9c7e72ad05a8a
 SHA512:
-  metadata.gz: a63b4c25f0838edbb6ba6cb787b68000e614afbfbb700a3167a5222ab7219fef4f7add25a009991de44b78eeb2b117c96f0743655e0fa058e4ac3d697877093b
-  data.tar.gz: c8700770e6873e0a9af730cc94b149c019d63df0aadd585f3f382e1c4fe4246d9d4bb243e9f8347ed4bdb83b67d84aa497de69152cf3ea2921c6be55b9037d05
+  metadata.gz: cf11cb89af1acd465fe769616d925e1c20fb3961953ed29483147ef67a132e09a52f763601a3397887f6ff49d42f4dddc2b27ce6f1f659d99062e332eb401cf2
+  data.tar.gz: 5033d59e77e627b40fb054036ac87ee45e5c60408e37dcb6ff2790cca7a3276f4a45ee62d36bab5ec2d9d7af038eb4c1467c84bd3174ace1b5fc73b483d0d8db

data/lib/moxml/adapter/leptris/serialize.rb

@@ -85,26 +85,37 @@ module Moxml
         # detection below is a no-op on correct builds.
         RAW_AMP_RE = /&(?!#{Entity::NAME_PATTERN};|#\d+;|#x[0-9A-Fa-f]+;)/
 
+        # A raw "<" in text position — the engine intermittently
+        # loses the escape when parsing under allocation pressure
+        # (leptris-ruby#131), so a decoded &#x3c; serializes bare and
+        # reparsing truncates at it. Valid markup NEVER puts "<"
+        # before a non-name, non-delimiter character, so this is
+        # deterministic in markup segments (CDATA is literal and
+        # excluded by the segment walker).
+        RAW_LT_RE = /<(?![A-Za-z_:\/?!])/
+
         def normalize_serialization(xml, options)
           # The libxml2-layout serializer (>= 1.9.42) keeps attribute
           # apostrophes literal; older engines escaped them.
           needs_apos = !LIBXML2_LAYOUT_PARITY && xml.include?("&apos;")
           needs_expand = options[:expand_empty] && xml.include?("/>")
-          # One scan: the bare-ampersand regex fails fast on
-          # ampersand-free output — no include? pre-filter needed.
+          # One scan each: both regexes fail fast on clean output.
           needs_amp = xml.match?(RAW_AMP_RE)
-          return xml unless needs_apos || needs_expand || needs_amp
+          needs_lt = xml.match?(RAW_LT_RE)
+          return xml unless needs_apos || needs_expand || needs_amp || needs_lt
 
           out = +""
           pos = 0
           while pos < xml.length
             opener_at, terminator = next_literal_region(xml, pos)
             if opener_at.nil?
-              out << normalize_markup(xml[pos..], needs_apos, needs_expand, needs_amp: needs_amp)
+              out << normalize_markup(xml[pos..], needs_apos, needs_expand,
+                                      needs_amp: needs_amp, needs_lt: needs_lt)
               break
             end
 
-            out << normalize_markup(xml[pos...opener_at], needs_apos, needs_expand, needs_amp: needs_amp)
+            out << normalize_markup(xml[pos...opener_at], needs_apos, needs_expand,
+                                    needs_amp: needs_amp, needs_lt: needs_lt)
             search_from = opener_at + opener_at_offset(terminator)
             close = xml.index(terminator, search_from)
             close_end = close.nil? ? xml.length : close + terminator.length
@@ -136,7 +147,7 @@ module Moxml
           terminator == "-->" ? 4 : 0
         end
 
-        def normalize_markup(markup, needs_apos, needs_expand, needs_amp: false)
+        def normalize_markup(markup, needs_apos, needs_expand, needs_amp: false, needs_lt: false)
           markup = markup.gsub("&apos;", "'") if needs_apos
           if needs_expand
             markup = markup.gsub(EMPTY_ELEMENT_RE) do
@@ -144,8 +155,9 @@ module Moxml
             end
           end
           # Segment-aware: this never sees CDATA/comment/PI content,
-          # where a bare & is literal data.
+          # where bare & and < are literal data.
           markup = markup.gsub(RAW_AMP_RE, "&amp;") if needs_amp
+          markup = markup.gsub(RAW_LT_RE, "&lt;") if needs_lt
           markup
         end
       end

data/lib/moxml/adapter/leptris.rb

@@ -288,6 +288,19 @@ module Moxml
           return set_attribute_namespace(node, namespace) if node.is_a?(::Leptris::XML::Attr)
 
           element = node
+          if namespace.nil?
+            # Nil-clear contract (issue #164): undeclare the default
+            # namespace (xmlns="") and drop any name prefix — the
+            # element then reports no namespace, matching the other
+            # adapters. Elements that carried a PREFIX cannot fully
+            # detach the engine's namespace link (leptris-ruby#132):
+            # the name is unqualified and the undeclaration added, but
+            # the serializer may re-attach the old prefix until the
+            # engine grows a clear entry.
+            element.name = element.name.split(":", 2)[-1] if element.name.include?(":")
+            element.default_namespace = ""
+            return element
+          end
           prefix = namespace.is_a?(String) ? nil : namespace.prefix
           uri = namespace.is_a?(String) ? namespace : namespace.href
           if prefix.nil? || prefix.empty?

data/lib/moxml/adapter/oga.rb

@@ -170,6 +170,12 @@ module Moxml
         end
 
         def set_namespace(element, ns_or_string)
+          if ns_or_string.nil?
+            element.namespace_name = nil
+            set_attribute(element, "xmlns", "")
+            return element
+          end
+
           element.namespace_name = ns_or_string.to_s
           element
         end

data/lib/moxml/adapter/ox.rb

@@ -149,6 +149,12 @@ module Moxml
         def set_namespace(element, ns)
           return element unless element.is_a?(::Ox::Element) || element.is_a?(::Ox::Node)
 
+          if ns.nil?
+            set_attribute(element, "xmlns", "")
+            element.name = element.name.to_s.sub(/\A(?:\w+):/, "")
+            return element
+          end
+
           prefix = ns.prefix
           # attributes don't have attributes but can have a namespace prefix
           if element.is_a?(::Ox::Element)

data/lib/moxml/adapter/rexml.rb

@@ -485,6 +485,14 @@ module Moxml
 
         # add a namespace prefix to the element name AND a namespace definition
         def set_namespace(element, ns)
+          if ns.nil?
+            # Nil-clear contract (issue #164): the XML Namespaces 1.0
+            # undeclaration, plus an unqualified name.
+            element.add_namespace(nil, "") if element.is_a?(::REXML::Element)
+            element.name = element.name.to_s.sub(/\A(?:\w+):/, "")
+            return element
+          end
+
           prefix = ns.name.to_s.empty? ? "xmlns" : ns.name.to_s
           if element.is_a?(::REXML::Element)
             element.add_namespace(prefix,

data/lib/moxml/version.rb

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

data/spec/integration/shared_examples/node_wrappers/namespace_behavior.rb

@@ -280,6 +280,12 @@ RSpec.shared_examples "Moxml::Namespace" do
         expect(root.namespace.uri).to eq("http://example.org/1")
         expect(child.namespace.uri).to eq("http://example.org/2")
       end
+
+      it "accepts namespace = nil without raising (issue #164)" do
+        cleared = context.parse(%(<r xmlns="urn:clear"><c>t</c></r>))
+        child = cleared.root.children.first
+        expect { child.namespace = nil }.not_to raise_error
+      end
     end
   end
 end

data/spec/moxml/adapter/leptris_spec.rb

@@ -243,6 +243,55 @@ RSpec.describe Moxml::Adapter::Leptris do
       expect(doc.root.children.to_a.select(&:text?)).to be_empty
     end
 
+    it "repairs a raw < in text position (issue #167 / leptris-ruby#131)" do
+      # The engine intermittently drops the escape when parsing under
+      # allocation pressure: a decoded &#x3c; serializes bare and the
+      # output fails to reparse. Valid markup never puts < before a
+      # non-name character, so the damage is deterministically
+      # repairable in markup segments.
+      repaired = described_class.normalize_serialization(
+        %(<?xml version="1.0"?><r><pre>A <\n B</pre></r>\n), {}
+      )
+      expect(repaired).to include("A &lt;")
+      expect(repaired).not_to match("A <")
+    end
+
+    it "keeps a literal < inside CDATA untouched by the repair" do
+      doc = ctx.parse(%(<r><![CDATA[A < B]]></r>))
+      expect(doc.to_xml).to include("<![CDATA[A < B]]>")
+    end
+
+    it "survives parse-under-allocation-pressure without emitting raw < (issue #167)" do
+      xml = "<?xml version=\"1.0\"?><doc>#{%(<s><pre alt="A B">A &#x3c;\n B</pre></s>) * 10}</doc>"
+      30.times do
+        100.times { |j| "pressure#{j}" * 20 }
+        out = ctx.parse(xml, noblanks: true).to_xml(
+          declaration: true, encoding: "UTF-8", indent: 2, expand_empty: false,
+        )
+        expect(out).not_to match("A <"), "raw unescaped < leaked into text"
+        expect(Nokogiri::XML(out, &:strict)).to be_a(Nokogiri::XML::Document)
+      end
+    end
+
+    it "clears the namespace with nil — full contract (issue #164)" do
+      doc = ctx.parse(%(<r xmlns="urn:clear"><c>t</c></r>))
+      child = doc.root.children.first
+      child.namespace = nil
+      expect(child.namespace).to be_nil
+      expect(doc.to_xml).to include(%(<c xmlns="">t</c>))
+      reparsed = ctx.parse(doc.to_xml)
+      expect(reparsed.root.children.first.namespace).to be_nil
+    end
+
+    it "does not raise clearing a namespace from a prefixed element (issue #164)" do
+      # The engine cannot detach a prefix element's namespace link
+      # (leptris-ruby#132); the name is unqualified and the
+      # undeclaration added meanwhile.
+      doc = ctx.parse(%(<r xmlns:p="urn:p"><p:c>t</p:c></r>))
+      child = doc.root.children.first
+      expect { child.namespace = nil }.not_to raise_error
+    end
+
     it "refuses noblanks on readonly parses while the strip path is active" do
       # The strip mutates the tree; readonly freezes it at parse. On
       # bindings whose engine flag is libxml2-safe (probe), the flag

metadata

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