moxml 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 747d843c7a968e3a25871ac9e5c67dead62e5a494a23eed41af6e157df9d66e4
-  data.tar.gz: a636fb5fc49e0c5ebcda6a16484e2685957d9e8666b0bf043d16e5f84bcb0e57
+  metadata.gz: 1c61c5dcecbe10b9f0f2850a134c9a8c5e2ec7d0be5b5b1dbb828dac25019a55
+  data.tar.gz: f418e1f7a7406bfcc0dd9e57bc2a6b372a332b0e6677821a9e2b7a8173871b45
 SHA512:
-  metadata.gz: 96248578b7b4294981437cd73baa349c99f9b01a259800c3ac48662e84fdfe4cc84fc34eef4f3d47e7f7be5517c3e4fa895e48021cd73166dcaf9867533a6461
-  data.tar.gz: 733f99bd21656a83e17b8b6d52d08d12a19c7425364d2c8266cc2033962a8f506f8f0f603e0cdf5f0e17843dbf8b6a785b1e4462aef82c7aa173f4a8dc3d0ea2
+  metadata.gz: 44ccdeb45ec15bdadb02a470bd8506f051ee22385a0832b78d17b607ef32a192b28f0ec716f7910f2ba22c106b0a48ffec85aaaf1dbe33f7ce4a1f4fd7108695
+  data.tar.gz: 49ed1641cd66fe4efa02f0e072b07621f441e3936734aba4ebb58a2f9188fab5feae920c989b21476019b01fac1562afc36356059d4c979f9a41b8f3e29686ec

data/Rakefile

@@ -35,7 +35,7 @@ namespace :spec do
 
       runner.default_path = "spec"
       runner.requires = %w[rexml_compat rexml/document rexml/xpath
-                           moxml/adapter/rexml spec_helper support/opal]
+                           moxml_boot spec_helper support/opal]
       runner.files = Dir.glob("spec/moxml/*opal*_spec.rb") +
         Dir.glob("spec/moxml/native_attachment/opal_spec.rb") +
         Dir.glob("spec/moxml/adapter/shared_examples/*.rb")

data/lib/compat/opal/moxml_boot.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Opal doesn't support Ruby autoload. This file explicitly requires
+# all Moxml modules that would normally be lazy-loaded via autoload
+# in lib/moxml.rb. Loaded by the Opal Rakefile before spec_helper.
+
+require "moxml/version"
+require "moxml/error"
+require "moxml/native_attachment"
+require "moxml/native_attachment/opal"
+require "moxml/xml_utils"
+require "moxml/xml_utils/encoder"
+require "moxml/node"
+require "moxml/node_set"
+require "moxml/document"
+require "moxml/element"
+require "moxml/attribute"
+require "moxml/text"
+require "moxml/cdata"
+require "moxml/comment"
+require "moxml/processing_instruction"
+require "moxml/declaration"
+require "moxml/namespace"
+require "moxml/doctype"
+require "moxml/entity_reference"
+require "moxml/entity_registry"
+require "moxml/adapter"
+require "moxml/adapter/base"
+require "moxml/adapter/customized_rexml"
+require "moxml/adapter/customized_rexml/entity_reference"
+require "moxml/adapter/customized_rexml/formatter"
+require "moxml/sax"
+require "moxml/sax/handler"
+require "moxml/sax/element_handler"
+require "moxml/sax/block_handler"
+require "moxml/sax/namespace_splitter"
+require "moxml/adapter/rexml"
+require "moxml/document_builder"
+require "moxml/builder"
+require "moxml/context"
+require "moxml/config"
+require "moxml/xpath"
+require "moxml/xpath/engine"
+require "moxml/xpath/context"
+require "moxml/xpath/conversion"
+require "moxml/xpath/cache"
+require "moxml/xpath/lexer"
+require "moxml/xpath/parser"
+require "moxml/xpath/compiler"
+require "moxml/xpath/errors"
+require "moxml/xpath/ast/node"
+require "moxml/xpath/ruby/node"
+require "moxml/xpath/ruby/generator"

data/lib/moxml/adapter/base.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../xml_utils"
-require_relative "../document_builder"
-
 module Moxml
   module Adapter
     class Base
@@ -104,8 +101,7 @@ module Moxml
         #
         # @return [Boolean] true if SAX parsing is supported
         def sax_supported?
-          respond_to?(:sax_parse) &&
-            method(:sax_parse).owner != Moxml::Adapter::Base.singleton_class
+          method(:sax_parse).owner != Moxml::Adapter::Base.singleton_class
         end
 
         def create_document(_native_doc = nil)
@@ -212,6 +208,10 @@ namespace_validation_mode: :strict)
           wrapper.has_xml_declaration
         end
 
+        # Clear the declaration state from the native document.
+        # Called when a Declaration node is removed from a document.
+        def remove_declaration(_native_doc); end
+
         # Return the actual native node after an add_child operation.
         # Override for adapters where node identity may change (e.g., LibXML doc.root=).
         def actual_native(child_native, _parent_native)

data/lib/moxml/adapter/customized_libxml/cdata.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "node"
-
 module Moxml
   module Adapter
     module CustomizedLibxml

data/lib/moxml/adapter/customized_libxml/comment.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "node"
-
 module Moxml
   module Adapter
     module CustomizedLibxml

data/lib/moxml/adapter/customized_libxml/element.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "node"
-
 module Moxml
   module Adapter
     module CustomizedLibxml
@@ -12,7 +10,7 @@ module Moxml
       class Element < Node
         # Add a child to this element, handling document import automatically
         def add_child(child)
-          child_native = child.respond_to?(:native) ? child.native : child
+          child_native = child.is_a?(Node) ? child.native : child
 
           # Check if child needs to be imported
           if needs_import?(child_native)
@@ -26,9 +24,9 @@ module Moxml
         private
 
         def needs_import?(child_node)
-          return false unless @native.respond_to?(:doc)
+          return false unless @native.is_a?(::LibXML::XML::Node)
           return false unless @native.doc
-          return false unless child_node.respond_to?(:doc)
+          return false unless child_node.is_a?(::LibXML::XML::Node)
           return false unless child_node.doc
 
           child_node.doc != @native.doc

data/lib/moxml/adapter/customized_libxml/node.rb

@@ -22,7 +22,7 @@ module Moxml
         def ==(other)
           return false unless other
 
-          other_native = other.respond_to?(:native) ? other.native : other
+          other_native = other.is_a?(self.class) ? other.native : other
           @native == other_native
         end
 
@@ -34,7 +34,7 @@ module Moxml
 
         # Check if node has a document
         def document_present?
-          @native.respond_to?(:doc) && !@native.doc.nil?
+          @native.is_a?(::LibXML::XML::Node) && !@native.doc.nil?
         end
 
         # Get the document this node belongs to

data/lib/moxml/adapter/customized_libxml/processing_instruction.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "node"
-
 module Moxml
   module Adapter
     module CustomizedLibxml

data/lib/moxml/adapter/customized_libxml/text.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "node"
-
 module Moxml
   module Adapter
     module CustomizedLibxml

data/lib/moxml/adapter/customized_rexml/formatter.rb

@@ -185,9 +185,8 @@ module Moxml
           node.attributes.each do |name, attr|
             next unless name.to_s.start_with?("xmlns:") || name.to_s == "xmlns"
 
-            # convert the default namespace
             name = "xmlns" if name.to_s == "xmlns:"
-            value = attr.respond_to?(:value) ? attr.value : attr
+            value = attr.is_a?(::REXML::Attribute) ? attr.value : attr
             output << " #{name}=\"#{value}\""
           end
 
@@ -196,14 +195,14 @@ module Moxml
             next if name.to_s.start_with?("xmlns:") || name.to_s == "xmlns"
 
             output << " "
-            output << if attr.respond_to?(:prefix) && attr.prefix
+            output << if attr.is_a?(::REXML::Attribute) && attr.prefix
                         "#{attr.prefix}:#{attr.name}"
                       else
                         name.to_s
                       end
 
             output << "=\""
-            value = attr.respond_to?(:value) ? attr.value : attr
+            value = attr.is_a?(::REXML::Attribute) ? attr.value : attr
             output << escape_attribute_value(value.to_s)
             output << "\""
           end # rubocop:enable Style/CombinableLoops

data/lib/moxml/adapter/headed_ox.rb

@@ -2,11 +2,7 @@
 
 return if RUBY_ENGINE == "opal"
 
-require_relative "ox"
-require_relative "../xpath"
-# Force load XPath modules (autoload doesn't work well with relative requires in examples)
-require_relative "../xpath/parser"
-require_relative "../xpath/compiler"
+require "moxml/adapter/ox"
 
 module Moxml
   module Adapter

data/lib/moxml/adapter/libxml.rb

@@ -2,14 +2,14 @@
 
 return if RUBY_ENGINE == "opal"
 
-require_relative "base"
 require "libxml"
-require_relative "customized_libxml"
-require_relative "../sax/namespace_splitter"
 
 module Moxml
   module Adapter
     class Libxml < Base
+      autoload :EntityRefRegistry, "moxml/adapter/libxml/entity_ref_registry"
+      autoload :EntityRestorer, "moxml/adapter/libxml/entity_restorer"
+
       # Wrapper class to store DOCTYPE information
       class DoctypeWrapper
         attr_reader :native_doc
@@ -239,7 +239,7 @@ module Moxml
           # Duck-typed fallback for libxml types that aren't ::Node
           # subclasses but still expose node_type (e.g. ::Attr).
           native = unpatch_node(node)
-          return :unknown unless native.respond_to?(:node_type)
+          return :unknown unless native.is_a?(::LibXML::XML::Node)
 
           NATIVE_NODE_TYPE_MAP[native.node_type] || :unknown
         end
@@ -836,7 +836,7 @@ module Moxml
           return [] unless namespaces
 
           namespace_list =
-            if namespaces.respond_to?(:definitions)
+            if namespaces.is_a?(::LibXML::XML::Namespaces)
               namespaces.definitions
             else
               namespaces
@@ -1076,6 +1076,11 @@ module Moxml
           end
         end
 
+        def remove_declaration(native_doc)
+          decl = attachments.get(native_doc, :declaration)
+          decl&.removed = true
+        end
+
         # LibXML's doc.root= creates a new Ruby wrapper with different object_id.
         # Return the actual root node so attachments are stored on the correct object.
         def actual_native(child_native, parent_native)
@@ -1319,7 +1324,7 @@ module Moxml
           return unless elem.is_a?(::LibXML::XML::Node)
 
           ns_list = elem.namespaces
-          return unless ns_list.respond_to?(:definitions)
+          return unless ns_list.is_a?(::LibXML::XML::Namespaces)
 
           definitions = ns_list.definitions
           return if definitions.empty?
@@ -1551,7 +1556,7 @@ module Moxml
 
           # Also check if this element has an active namespace (inherited or own)
           # This catches cases where elements inherit namespaces from parents
-          if node.is_a?(::LibXML::XML::Node) && node.namespaces.respond_to?(:namespace)
+          if node.is_a?(::LibXML::XML::Node) && node.namespaces.is_a?(::LibXML::XML::Namespaces)
             active_ns = node.namespaces.namespace
             if active_ns
               prefix = active_ns.prefix
@@ -1720,6 +1725,3 @@ module Moxml
     end
   end
 end
-
-require_relative "libxml/entity_ref_registry"
-require_relative "libxml/entity_restorer"

data/lib/moxml/adapter/nokogiri.rb

@@ -2,9 +2,7 @@
 
 return if RUBY_ENGINE == "opal"
 
-require_relative "base"
 require "nokogiri"
-require_relative "../sax/namespace_splitter"
 
 module Moxml
   module Adapter
@@ -426,6 +424,10 @@ module Moxml
           end
         end
 
+        def remove_declaration(native_doc)
+          attachments.set(native_doc, :xml_decl, nil)
+        end
+
         private
 
         def build_declaration_attrs(version, encoding, standalone)

data/lib/moxml/adapter/oga.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "base"
-require_relative "customized_oga"
 require "oga"
-require_relative "../sax/namespace_splitter"
 
 module Moxml
   module Adapter
@@ -470,13 +467,16 @@ module Moxml
         def has_declaration?(native_doc, _wrapper)
           decl = attachments.get(native_doc, :xml_declaration)
           if decl.nil? && !attachments.key?(native_doc, :xml_declaration)
-            # No attachment entry - check native doc (for parsed documents)
-            native_doc.respond_to?(:xml_declaration) && !native_doc.xml_declaration.nil?
+            native_doc.is_a?(::Oga::XML::Document) && !native_doc.xml_declaration.nil?
           else
             !decl.nil?
           end
         end
 
+        def remove_declaration(native_doc)
+          attachments.set(native_doc, :xml_declaration, nil)
+        end
+
         private
 
         def declaration_to_xml(decl)
@@ -503,11 +503,11 @@ module Moxml
 
             if should_include_decl
               decl = effective_xml_declaration || node.xml_declaration
-              if decl
-                output << declaration_to_xml(decl)
-              else
-                output << '<?xml version="1.0" encoding="UTF-8"?>'
-              end
+              output << if decl
+                          declaration_to_xml(decl)
+                        else
+                          '<?xml version="1.0" encoding="UTF-8"?>'
+                        end
               output << "\n"
             end
 

data/lib/moxml/adapter/ox.rb

@@ -2,11 +2,8 @@
 
 return if RUBY_ENGINE == "opal"
 
-require_relative "base"
 require "ox"
 require "stringio"
-require_relative "customized_ox"
-require_relative "../sax/namespace_splitter"
 
 # insert :parent methods to all Ox classes inherit the Node class
 Ox::Node.attr_accessor :parent
@@ -20,14 +17,13 @@ module Moxml
 
         def set_root(doc, element)
           existing_root = root(doc)
+          element.parent = doc if element.is_a?(::Ox::Node)
           if existing_root
             # Replace the existing root element, preserving other children
-            element.parent = doc if element.is_a?(::Ox::Node)
             idx = doc.nodes.index(existing_root)
             doc.nodes[idx] = element
           else
             # No root yet, just append the element
-            element.parent = doc if element.is_a?(::Ox::Node)
             doc << element
           end
         end
@@ -116,7 +112,7 @@ module Moxml
                   elsif system_id
                     "#{name} SYSTEM \"#{system_id}\""
                   else
-                    "#{name}"
+                    name.to_s
                   end
           ::Ox::DocType.new(value)
         end
@@ -272,7 +268,7 @@ module Moxml
           # Ox doesn't set parent references during parsing.
           # Set them here so parent/sibling navigation works.
           result.each do |child|
-            child.parent = node if child.respond_to?(:parent=)
+            child.parent = node if child.is_a?(::Ox::Element)
           end
           result
         end
@@ -383,12 +379,15 @@ module Moxml
         end
 
         def add_child(element, child)
-          # Special handling for declarations on Ox documents
           if element.is_a?(::Ox::Document) && child.is_a?(::Ox::Instruct) && child.target == "xml"
             element.attributes ||= {}
             element.attributes[:version] = child.attributes["version"] if child.attributes["version"]
             element.attributes[:encoding] = child.attributes["encoding"] if child.attributes["encoding"]
             element.attributes[:standalone] = child.attributes["standalone"] if child.attributes["standalone"]
+            attachments.set(element, :decl_explicit, {
+                              encoding: child.attributes.key?("encoding") ? child.attributes["encoding"] : nil,
+                              standalone: child.attributes.key?("standalone") ? child.attributes["standalone"] : nil,
+                            })
             return
           end
 
@@ -481,8 +480,8 @@ module Moxml
         end
 
         def assign_parents(node, parent = nil)
-          node.parent = parent if node.respond_to?(:parent=) && parent
-          return unless node.respond_to?(:nodes)
+          node.parent = parent if node.is_a?(::Ox::Element) && parent
+          return unless node.is_a?(::Ox::Element) || node.is_a?(::Ox::Document)
 
           node.nodes&.each do |child|
             assign_parents(child, node)
@@ -688,12 +687,26 @@ module Moxml
         end
 
         def has_declaration?(native_doc, _wrapper)
-          # Ox stores declaration in document attributes
           native_doc[:version] || native_doc[:encoding] || native_doc[:standalone]
         end
 
+        def remove_declaration(native_doc)
+          native_doc.attributes&.delete(:version)
+          native_doc.attributes&.delete(:encoding)
+          native_doc.attributes&.delete(:standalone)
+          attachments.delete(native_doc, :decl_explicit)
+        end
+
         private
 
+        def resolve_decl_attr(node, attr, fallback)
+          if attachments.key?(node, :decl_explicit)
+            attachments.get(node, :decl_explicit)[attr]
+          else
+            node[attr] || fallback
+          end
+        end
+
         def serialize_standard(node, options = {})
           output = ""
           if node.is_a?(::Ox::Document)
@@ -705,8 +718,8 @@ module Moxml
 
             if should_include_decl
               version = node[:version] || "1.0"
-              encoding = options[:encoding] || node[:encoding]
-              standalone = node[:standalone]
+              encoding = resolve_decl_attr(node, :encoding, options[:encoding])
+              standalone = resolve_decl_attr(node, :standalone, nil)
 
               decl = create_native_declaration(version, encoding, standalone)
               output = ::Ox.dump(::Ox::Document.new << decl).strip
@@ -715,7 +728,7 @@ module Moxml
 
           ox_options = {
             indent: -1,
-            with_instructions: true,
+            with_instructions: false,
             encoding: options[:encoding],
             no_empty: options[:expand_empty],
           }
@@ -767,8 +780,8 @@ module Moxml
                                   end
             if should_include_decl
               version = node[:version] || "1.0"
-              encoding = options[:encoding] || node[:encoding]
-              standalone = node[:standalone]
+              encoding = resolve_decl_attr(node, :encoding, options[:encoding])
+              standalone = resolve_decl_attr(node, :standalone, nil)
               output << "<?xml version=\"#{version}\""
               output << " encoding=\"#{encoding}\"" if encoding
               output << " standalone=\"#{standalone}\"" if standalone

data/lib/moxml/adapter/rexml.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "base"
 require "rexml/document"
 require "rexml/xpath"
 require "set" unless RUBY_ENGINE == "opal"
 require "stringio" if RUBY_ENGINE == "opal"
-require_relative "customized_rexml"
-require_relative "../sax/namespace_splitter"
 
 module Moxml
   module Adapter
@@ -173,7 +170,7 @@ module Moxml
         end
 
         def duplicate_node(node)
-          if node.respond_to?(:deep_clone)
+          if node.is_a?(::REXML::Parent)
             node.deep_clone
           else
             Marshal.load(Marshal.dump(node))
@@ -620,9 +617,7 @@ module Moxml
         def has_declaration?(native_doc, wrapper)
           xml_decl = attachments.get(native_doc, :xml_declaration)
           if xml_decl.nil?
-            # Attachment key doesn't exist - check native doc or wrapper flag
             if attachments.key?(native_doc, :xml_declaration)
-              # Explicitly set to nil (was removed)
               false
             else
               wrapper.has_xml_declaration
@@ -632,6 +627,10 @@ module Moxml
           end
         end
 
+        def remove_declaration(native_doc)
+          attachments.set(native_doc, :xml_declaration, nil)
+        end
+
         private
 
         def write_with_formatter(node, output, indent = 2)

data/lib/moxml/adapter.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "adapter/base"
-
 module Moxml
   module Adapter
+    autoload :Base, "moxml/adapter/base"
+    autoload :CustomizedOga, "moxml/adapter/customized_oga"
+    autoload :CustomizedOx, "moxml/adapter/customized_ox"
+    autoload :CustomizedRexml, "moxml/adapter/customized_rexml"
+    autoload :CustomizedLibxml, "moxml/adapter/customized_libxml"
+
     AVAILABLE_ADAPTERS = %i[nokogiri oga rexml ox headed_ox libxml].freeze
 
     # Adapters that work under the Opal (JavaScript) runtime.
@@ -59,11 +63,15 @@ module Moxml
       end
 
       def require_adapter(name)
-        require "#{__dir__}/adapter/#{name}"
+        # Opal pre-loads all dependencies via the Rakefile; skip runtime require.
+        return if RUBY_ENGINE == "opal"
+
+        require "moxml/adapter/base"
+        require "moxml/adapter/#{name}"
       rescue LoadError
         begin
           require name.to_s
-          require "#{__dir__}/adapter/#{name}"
+          require "moxml/adapter/#{name}"
         rescue LoadError => e
           raise Moxml::AdapterError.new(
             "Failed to load #{name} adapter",

data/lib/moxml/attribute.rb

@@ -21,6 +21,8 @@ module Moxml
       adapter.restore_entities(val)
     end
 
+    alias content value
+
     # Returns raw native value without entity marker restoration.
     def raw_value
       @native.value
@@ -46,11 +48,12 @@ module Moxml
     end
 
     def element
-      adapter.attribute_element(@native)
+      native_elem = adapter.attribute_element(@native)
+      native_elem && Moxml::Node.wrap(native_elem, context)
     end
 
     def remove
-      adapter.remove_attribute(element, name)
+      adapter.remove_attribute(adapter.attribute_element(@native), name)
       if @parent_node.is_a?(Moxml::Element)
         @parent_node.invalidate_attribute_cache!
       end

data/lib/moxml/config.rb

@@ -113,6 +113,7 @@ module Moxml
     end
 
     def entity_load_mode=(mode)
+      mode = mode.to_sym
       unless ENTITY_LOAD_MODES.include?(mode)
         raise ArgumentError,
               "Invalid entity_load_mode: #{mode}. Must be one of: #{ENTITY_LOAD_MODES.join(', ')}"

data/lib/moxml/context.rb

@@ -17,13 +17,12 @@ module Moxml
     end
 
     def parse(xml, options = {})
-      # Detect if input has XML declaration
-      xml_string = if xml.respond_to?(:read)
+      xml_string = if xml.is_a?(String)
+                     xml
+                   else
                      xml.read.tap do
-                       xml.rewind if xml.respond_to?(:rewind)
+                       xml.rewind if xml.is_a?(IO) || xml.is_a?(StringIO)
                      end
-                   else
-                     xml.to_s
                    end
       has_declaration = xml_string.strip.start_with?("<?xml")
 
@@ -59,9 +58,6 @@ module Moxml
     #   end
     #
     def sax_parse(xml, handler = nil, &block)
-      # Load SAX module if not already loaded
-      require_relative "sax" unless defined?(Moxml::SAX)
-
       # Create block handler if block given
       handler ||= SAX::BlockHandler.new(&block) if block
 
@@ -75,6 +71,10 @@ module Moxml
       config.adapter.sax_parse(xml, handler)
     end
 
+    def build(&block)
+      Builder.new(self).build(&block)
+    end
+
     private
 
     def build_entity_registry

data/lib/moxml/declaration.rb

@@ -34,13 +34,8 @@ module Moxml
     end
 
     def remove
-      # Mark document as having no declaration when declaration is removed
-      # Store in adapter's attachment map so all wrappers see it
-      native_doc = adapter.document(@native)
-      if native_doc && adapter.respond_to?(:attachments)
-        adapter.attachments.set(native_doc, :has_declaration, false)
-      end
-
+      native_doc = @parent_node&.native
+      adapter.remove_declaration(native_doc) if native_doc
       super
     end