moxml 0.5.21 → 0.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efd15ef624c00bcb6215f7a120272833f45f4c0f297d2a98b19507540878eec8
-  data.tar.gz: 640713084bd178087975387abca9cec4a681c2e94ce905ac16becb5514e25ca2
+  metadata.gz: 4c88f88d6ab8eafea4b11c8007e7b667e1413bfc60715142ef280af00c1909de
+  data.tar.gz: 8302e755e10fa582f9349c443fc91ed63ddd684ce24c45f0baedd88f0541c16f
 SHA512:
-  metadata.gz: 2d418bb84689e70721a4e9b16359136e94d781d7da0bc2c9b7374f58ff911d08fff0eb874a8ed31a6434b9d953381714ad8d1dad5911a6b457b8ae6143a53491
-  data.tar.gz: 6aca55287d55514bd1dfc52c4286909760fb2b9230c33989c21bda4b78d873977ca07ef30df165413d959a42cd7ffa052677aaae672dfe1884f6e84af3b270c5
+  metadata.gz: b7067b38f81a13bd29e1c542f66bd99636f594f91a754997744419549e259c0267a69daea3ab147410e425f243e9ddc807441860df8d91f00644b93f5608fd2e
+  data.tar.gz: 662df0f63b4600b923eeedf4747b04bbd71a3a0cd732d25f2ca4fccaf6b563b710f09d8fd470497434962aa024c1e9354f718ebd8b793649a4aa06033149852b

data/docs/_pages/adapters/leptris.adoc

@@ -71,9 +71,8 @@ implementation over one `leptris_node_traverse` call.
 
 * Tab indentation honors the indent-unit string on leptris >= 1.9.45
   (`indent_text:`), byte-identical to Nokogiri including
-  text-bearing children since the engine fix (leptris/leptris#658,
-  1.9.46); comment children still diverge on the element unit path
-  (leptris-ruby#115).
+  text-bearing children and comment children alike
+  (leptris/leptris#658 at 1.9.46; leptris-ruby#115 at 1.9.50).
 * A PI preceding the DOCTYPE reorders on serialization — libleptris
   normalizes DOCTYPE-first and the document node does not record its
   relative position.

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

@@ -147,10 +147,11 @@ module Moxml
           end
 
           # The engine's subset serializer mangles every declaration
-          # after the first (loses its "<") — moxml's own formatter is
-          # correct, so multi-declaration subsets compose.
+          # after the first (leptris/leptris#687) — moxml's own
+          # formatter is correct, so those compose until the probe
+          # says the engine is fixed.
           dt = doc.doctype
-          if dt&.class&.method_defined?(:internal_subset) &&
+          if !ENGINE_MULTI_DECL_SUBSET_OK && dt&.class&.method_defined?(:internal_subset) &&
               (subset = dt.internal_subset) && subset.scan("<!").size > 1
             return nil
           end

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

@@ -75,27 +75,34 @@ module Moxml
           # Element output always ends with the close tag — but the
           # engine's serializer appends a stray trailing newline when
           # the element's last text child is non-ASCII (fixed engine
-          # side in 1.9.42; kept for older floor bindings). Note: the
-          # binding's indent_text kwarg is the display-form boolean,
-          # not Nokogiri's indent-unit string — do not forward it.
+          # side in 1.9.42; kept for older floor bindings).
           xml.sub(/\n+\z/, "")
         end
 
+        # A bare ampersand — not starting a named or numeric entity
+        # reference. Some engine builds (observed: the Linux 1.9.50
+        # platform gem) emit text-content ampersands unescaped; the
+        # detection below is a no-op on correct builds.
+        RAW_AMP_RE = /&(?!#{Entity::NAME_PATTERN};|#\d+;|#x[0-9A-Fa-f]+;)/
+
         def normalize_serialization(xml, options)
-          needs_apos = xml.include?("'")
+          # The libxml2-layout serializer (>= 1.9.42) keeps attribute
+          # apostrophes literal; older engines escaped them.
+          needs_apos = !LIBXML2_LAYOUT_PARITY && xml.include?("'")
           needs_expand = options[:expand_empty] && xml.include?("/>")
-          return xml unless needs_apos || needs_expand
+          needs_amp = xml.include?("&") && xml.match?(RAW_AMP_RE)
+          return xml unless needs_apos || needs_expand || needs_amp
 
           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)
+              out << normalize_markup(xml[pos..], needs_apos, needs_expand, needs_amp: needs_amp)
               break
             end
 
-            out << normalize_markup(xml[pos...opener_at], needs_apos, needs_expand)
+            out << normalize_markup(xml[pos...opener_at], needs_apos, needs_expand, needs_amp: needs_amp)
             search_from = opener_at + opener_at_offset(terminator)
             close = xml.index(terminator, search_from)
             close_end = close.nil? ? xml.length : close + terminator.length
@@ -127,13 +134,16 @@ module Moxml
           terminator == "-->" ? 4 : 0
         end
 
-        def normalize_markup(markup, needs_apos, needs_expand)
+        def normalize_markup(markup, needs_apos, needs_expand, needs_amp: false)
           markup = markup.gsub("&apos;", "'") if needs_apos
           if needs_expand
             markup = markup.gsub(EMPTY_ELEMENT_RE) do
               "<#{Regexp.last_match(1)}#{Regexp.last_match(2)}></#{Regexp.last_match(1)}>"
             end
           end
+          # Segment-aware: this never sees CDATA/comment/PI content,
+          # where a bare & is literal data.
+          markup = markup.gsub(RAW_AMP_RE, "&amp;") if needs_amp
           markup
         end
       end

data/lib/moxml/adapter/leptris.rb

@@ -49,6 +49,39 @@ module Moxml
       INDENT_UNIT_SUPPORTED =
         Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.45")
 
+      # leptris-ruby#115 (fixed 1.9.50): the element unit path keeps
+      # child comments.
+      ELEMENT_UNIT_COMMENTS =
+        Gem::Version.new(::Leptris::VERSION) >= Gem::Version.new("1.9.50")
+
+      # leptris/leptris#677: the engine's DROP_WS_TEXT trims boundary
+      # whitespace of non-blank text nodes. Probed at load rather
+      # than version-gated so the C fix is adopted the moment a fixed
+      # binding installs — no moxml release needed. While the probe
+      # fails, noblanks drops blanks moxml-side after parse.
+      ENGINE_NOBLANKS_SAFE = begin
+        doc = ::Leptris::XML::Document.parse(
+          "<r> x</r>", options: ::Leptris::XML::ParseOptions.noblanks
+        )
+        text = doc.root.children.first
+        text.is_a?(::Leptris::XML::Text) && text.content == " x"
+      rescue StandardError
+        false
+      end
+
+      # leptris/leptris#687: the engine's subset serializer mangles
+      # every internal-subset declaration after the first. Probed for
+      # the same reason — once fixed, the whole-document fast path
+      # serves multi-declaration subsets too.
+      ENGINE_MULTI_DECL_SUBSET_OK = begin
+        doc = ::Leptris::XML::Document.parse(
+          %(<?xml version="1.0"?><!DOCTYPE r [<!ELEMENT r (#PCDATA)><!ATTLIST e a CDATA "d">]><r/>),
+        )
+        doc.to_xml.include?("<!ATTLIST")
+      rescue StandardError
+        false
+      end
+
       NO_PARSE_ERRORS = [].freeze
       private_constant :NO_PARSE_ERRORS
 
@@ -106,10 +139,10 @@ module Moxml
           ctx = _context || Context.new(:leptris)
           doc = Document.new(native_doc, ctx)
 
-          if options[:noblanks]
+          if options[:noblanks] && !ENGINE_NOBLANKS_SAFE
             # The engine's DROP_WS_TEXT trims boundary whitespace of
             # NON-blank text nodes at parse (leptris/leptris#677), so
-            # the flag is never forwarded — blanks drop here instead.
+            # the flag is not forwarded — blanks drop here instead.
             if options[:readonly] == true
               raise ArgumentError,
                     "noblanks: true requires a mutable document (readonly: true freezes the tree at parse)"
@@ -128,14 +161,12 @@ module Moxml
         # nil when no parse flag is requested — the binding treats a
         # nil options hash as plain defaults (matching libxml2/
         # Nokogiri semantics: blanks kept, no ATTLIST defaults).
-        # noblanks is deliberately absent: the engine's
-        # LEPTRIS_PARSE_DROP_WS_TEXT trims boundary whitespace of
-        # non-blank text nodes too (leptris/leptris#677), so moxml
-        # implements it itself after parse — see
-        # strip_blank_text_nodes!.
+        # noblanks forwards only once the engine flag is libxml2-safe
+        # (see ENGINE_NOBLANKS_SAFE); otherwise it is moxml-side.
         def parse_flags(options)
           flags = 0
           flags |= ::Leptris::XML::ParseOptions::DTDATTR if options[:dtdattr] == true
+          flags |= ::Leptris::XML::ParseOptions::NOBLANKS if options[:noblanks] == true && ENGINE_NOBLANKS_SAFE
           flags.zero? ? nil : ::Leptris::XML::ParseOptions.new(flags)
         end
 

data/lib/moxml/version.rb

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

data/spec/moxml/adapter/leptris_spec.rb

@@ -175,6 +175,14 @@ RSpec.describe Moxml::Adapter::Leptris do
       end
     end
 
+    it "keeps comments in element serialization with tab units (leptris-ruby#115)" do
+      skip "requires the element unit fix (leptris 1.9.50+)" unless described_class::ELEMENT_UNIT_COMMENTS
+
+      doc = ctx.parse(%(<r><a/><!-- c --></r>))
+      expect(doc.root.to_xml(indent: 1, indent_text: "\t"))
+        .to eq("<r>\n\t<a></a>\n\t<!-- c -->\n</r>")
+    end
+
     it "round-trips document-level PI mutations through serialization" do
       # leptris/leptris#612: parse-created document PIs carry doc
       # linkage — the setters work and the tree round-trips.
@@ -235,8 +243,12 @@ RSpec.describe Moxml::Adapter::Leptris do
       expect(doc.root.children.to_a.select(&:text?)).to be_empty
     end
 
-    it "refuses noblanks on readonly parses" do
-      # The strip mutates the tree; readonly freezes it at parse.
+    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
+      # forwards at parse and no mutability is needed.
+      skip "engine noblanks flag is libxml2-safe — no strip path" if described_class::ENGINE_NOBLANKS_SAFE
+
       expect { ctx.parse("<a/>", noblanks: true, readonly: true) }
         .to raise_error(ArgumentError, /noblanks.*mutable/)
     end

metadata

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