lutaml-model 0.8.11 → 0.8.13

data/lib/lutaml/xml/builder/rexml.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base"
-
 module Lutaml
   module Xml
     module Builder

data/lib/lutaml/xml/builder.rb

@@ -4,6 +4,7 @@ module Lutaml
   module Xml
     # Builder module for XML generation
     module Builder
+      autoload :Base, "#{__dir__}/builder/base"
       autoload :Oga, "#{__dir__}/builder/oga"
       Lutaml::Model::RuntimeCompatibility.autoload_native(
         self,

data/lib/lutaml/xml/configurable.rb

@@ -13,7 +13,7 @@ module Lutaml
     #     include Lutaml::Xml::Configurable
     #
     #     xml do
-    #       root 'MyModel'
+    #       element "MyModel"
     #       namespace MyNamespace
     #     end
     #   end
@@ -51,7 +51,7 @@ module Lutaml
         #
         #   @example Configuration with block
         #     xml do
-        #       root 'MyModel'
+        #       element "MyModel"
         #       namespace MyNamespace
         #       map_element 'name', to: :name
         #     end

data/lib/lutaml/xml/declaration_handler.rb

@@ -1,10 +1,9 @@
 module Lutaml
   module Xml
-    # DeclarationHandler provides XML declaration and DOCTYPE handling
-    # for all XML adapter implementations.
+    # DeclarationHandler provides XML declaration extraction from input XML.
     #
-    # This module implements Issue #1: XML Declaration Preservation
-    # across Nokogiri, Oga, and Ox adapters.
+    # Extraction methods detect and parse XML declarations from input strings.
+    # Generation is handled by moxml's document model — no manual string assembly.
     module DeclarationHandler
       # Extract XML declaration information from input string
       #
@@ -92,126 +91,25 @@ module Lutaml
       # @param xml_declaration [Hash] extracted declaration info from input
       # @return [Boolean] true if declaration should be included
       def should_include_declaration?(options, xml_declaration = nil)
-        # Use instance variable if not provided (for adapter instance methods)
         xml_declaration ||= @xml_declaration
 
         if options.key?(:declaration)
           case options[:declaration]
           when false
-            # Explicit false: omit declaration
             false
           when true
-            # Explicit true: force include
             true
           when :preserve
-            # Preserve mode: include if input had one
             xml_declaration&.dig(:had_declaration) || false
           when String
-            # Custom version string: include
             true
           else
-            # Default: preserve from input
             xml_declaration&.dig(:had_declaration) || false
           end
         else
-          # No declaration option provided: default behavior is preserve from input
           xml_declaration&.dig(:had_declaration) || false
         end
       end
-
-      # Generate XML declaration string
-      #
-      # Uses stored declaration info if available, otherwise uses defaults.
-      # Supports custom version strings, encoding, and standalone options.
-      #
-      # @param options [Hash] serialization options
-      #   - :declaration => String for custom version, true for default
-      #   - :encoding => String or true for UTF-8
-      #   - :standalone => String ("yes"/"no"), true ("yes"), false ("no"), :preserve
-      # @param xml_declaration [Hash] extracted declaration info from input
-      # @return [String] the XML declaration (includes trailing newline)
-      def generate_declaration(options, xml_declaration = nil)
-        # Use instance variable if not provided (for adapter instance methods)
-        xml_declaration ||= @xml_declaration
-
-        # Determine version
-        # When declaration: true (force), use default 1.0 not input version
-        # When declaration: "1.x" (custom), use that string
-        # When preserving (no option or :preserve), use input version or default
-        version = if options[:declaration].is_a?(String)
-                    # Custom version string
-                    options[:declaration]
-                  elsif options[:declaration] == true
-                    # Force with default version
-                    "1.0"
-                  elsif xml_declaration&.dig(:version)
-                    # Preserve from input
-                    xml_declaration[:version]
-                  else
-                    # Default fallback
-                    "1.0"
-                  end
-
-        # Determine encoding
-        # Priority: explicit encoding option > input encoding > none
-        encoding = if options[:encoding].is_a?(String)
-                     options[:encoding]
-                   elsif options[:encoding] == true
-                     "UTF-8"
-                   elsif xml_declaration&.dig(:encoding)
-                     xml_declaration[:encoding]
-                   end
-
-        # Determine standalone
-        # Priority: explicit standalone option > input standalone > none
-        # Supported values: "yes", "no", true ("yes"), false ("no"), :preserve
-        standalone = if options.key?(:standalone)
-                       case options[:standalone]
-                       when String
-                         options[:standalone]
-                       when true
-                         "yes"
-                       when false
-                         "no"
-                       when :preserve
-                         xml_declaration&.dig(:standalone)
-                       end
-                     elsif xml_declaration&.dig(:standalone)
-                       xml_declaration[:standalone]
-                     end
-
-        declaration = "<?xml version=\"#{version}\""
-        declaration += " encoding=\"#{encoding}\"" if encoding
-        declaration += " standalone=\"#{standalone}\"" if standalone
-        declaration += "?>\n"
-        declaration
-      end
-
-      # Generate DOCTYPE declaration from doctype hash
-      #
-      # Supports both PUBLIC and SYSTEM DTDs.
-      # Format: <!DOCTYPE name PUBLIC "public_id" "system_id">
-      #         <!DOCTYPE name SYSTEM "system_id">
-      #
-      # @param doctype [Hash] the doctype information
-      #   - :name => root element name
-      #   - :public_id => public identifier (optional)
-      #   - :system_id => system identifier (optional)
-      # @return [String, nil] the DOCTYPE declaration or nil if no doctype
-      def generate_doctype_declaration(doctype)
-        return nil unless doctype
-
-        parts = ["<!DOCTYPE #{doctype[:name]}"]
-
-        if doctype[:public_id]
-          parts << %(PUBLIC "#{doctype[:public_id]}")
-          parts << %("#{doctype[:system_id]}") if doctype[:system_id]
-        elsif doctype[:system_id]
-          parts << %(SYSTEM "#{doctype[:system_id]}")
-        end
-
-        "#{parts.join(' ')}>\n"
-      end
     end
   end
 end

data/lib/lutaml/xml/mapping.rb

@@ -350,11 +350,11 @@ module Lutaml
       #   namespace :blank
       #
       # @raise [ArgumentError] if invalid arguments provided
-      # @raise [Lutaml::Model::NoRootNamespaceError] if explicitly marked as no_root
+      # @raise [Lutaml::Model::TypeOnlyNamespaceError] if explicitly marked as no_root
       def namespace(ns_class_or_symbol, _deprecated_prefix = nil)
         # Only raise error for explicitly marked no_root (using deprecated method)
         # Type-only models (no element declared) CAN have namespaces
-        raise Lutaml::Model::NoRootNamespaceError if @no_root
+        raise Lutaml::Model::TypeOnlyNamespaceError if @no_root
 
         # Warn if prefix parameter is provided
         if _deprecated_prefix
@@ -784,7 +784,7 @@ module Lutaml
       #
       # @example
       #   xml do
-      #     root "rfc"
+      #     element "rfc"
       #     map_processing_instruction "rfc", to: :pi_settings
       #   end
       #

data/lib/lutaml/xml/schema/xsd/documentation.rb

@@ -10,7 +10,7 @@ module Lutaml
           attribute :content, :string
 
           xml do
-            root "documentation"
+            element "documentation"
             namespace Lutaml::Xml::Schema::XsdNamespace
 
             map_all to: :content

data/lib/lutaml/xml/schema/xsd.rb

@@ -2,11 +2,12 @@
 
 # NOTE: Do NOT require lutaml/model here. This file is autoloaded via
 # Lutaml::Xml::Schema::Xsd, and requiring lutaml/model creates a circular
-# dependency since lutaml/xml.rb requires lutaml/model. The adapter type
-# is already set by lutaml/xml.rb at the end.
+# dependency since lutaml/xml.rb requires lutaml/model. This file only sets
+# a fallback XML adapter when no adapter has been selected yet.
 
-adapter = RUBY_ENGINE == "opal" ? :oga : :nokogiri
-Lutaml::Model::Config.xml_adapter_type = adapter unless defined?(Lutaml::Model::Config.xml_adapter_type)
+unless defined?(Lutaml::Model::Config.xml_adapter_type)
+  Lutaml::Model::Config.xml_adapter_type = Lutaml::Model::AdapterResolver.detect_xml_adapter
+end
 
 # Require the XsdNamespace class for XSD schema support
 require_relative "xsd_namespace"

data/lib/lutaml/xml/schema.rb

@@ -3,11 +3,14 @@
 module Lutaml
   module Xml
     module Schema
-      autoload :Xsd, "#{__dir__}/schema/xsd"
-      autoload :XsdSchema, "#{__dir__}/schema/xsd_schema"
-      autoload :RelaxngSchema, "#{__dir__}/schema/relaxng_schema"
-      autoload :Builder, "#{__dir__}/schema/builder"
-      autoload :BuiltinTypes, "#{__dir__}/schema/builtin_types"
+      Lutaml::Model::RuntimeCompatibility.autoload_native(
+        self,
+        Xsd: "#{__dir__}/schema/xsd",
+        XsdSchema: "#{__dir__}/schema/xsd_schema",
+        RelaxngSchema: "#{__dir__}/schema/relaxng_schema",
+        Builder: "#{__dir__}/schema/builder",
+        BuiltinTypes: "#{__dir__}/schema/builtin_types",
+      )
     end
   end
 end

data/lib/lutaml/xml/serialization/collection_ext.rb

@@ -6,7 +6,7 @@ module Lutaml
       # XML-specific overrides for Collection class methods.
       #
       # Prepended into Collection's singleton class when XML is loaded.
-      # Provides XML-specific no_root handling for collections.
+      # Provides XML-specific unwrapped collection handling.
       module CollectionExt
         # XML is a structured (tree-based) format
         def collection_structured_format?(format)
@@ -15,15 +15,15 @@ module Lutaml
           true
         end
 
-        # XML handles no_root serialization specially
-        def collection_no_root_to?(format)
+        # XML handles unwrapped serialization specially
+        def collection_unwrapped_to?(format)
           return super unless format == :xml
 
           true
         end
 
-        # XML no_root serialization: serialize each mapping separately
-        def collection_no_root_to(format, mappings, instance, options)
+        # XML unwrapped serialization: serialize each mapping separately
+        def collection_unwrapped_to(format, mappings, instance, options)
           return super unless format == :xml
 
           mappings.mappings.map do |mapping|
@@ -31,8 +31,8 @@ module Lutaml
           end.join("\n")
         end
 
-        # XML no_root: wrap raw XML in a fake root tag before parsing
-        def wrap_no_root_input(format, mappings, data)
+        # XML unwrapped: wrap raw XML in a fake root tag before parsing
+        def wrap_unwrapped_input(format, mappings, data)
           return super unless format == :xml
 
           tag_name = mappings.find_by_to!(instance_name).name

data/lib/lutaml/xml/serialization/format_conversion.rb

@@ -94,7 +94,7 @@ module Lutaml
           return super unless format == :xml
 
           valid = root?(register) || options[:from_collection]
-          raise Lutaml::Model::NoRootMappingError.new(self) unless valid
+          raise Lutaml::Model::TypeOnlyMappingError.new(self) unless valid
 
           options[:encoding] = doc.encoding
           if doc.is_a?(Lutaml::Xml::Document) && doc.doctype

data/lib/lutaml/xml/serialization/instance_methods.rb

@@ -204,7 +204,7 @@ module Lutaml
           return super unless format == :xml
           return if options[:collection] || self.class.root?(lutaml_register)
 
-          raise Lutaml::Model::NoRootMappingError.new(self.class)
+          raise Lutaml::Model::TypeOnlyMappingError.new(self.class)
         end
 
         # XML-specific instance options preparation

data/lib/lutaml/xml/xml_orderable.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Xml
+    # Mixin for XML element/attribute ordering state.
+    #
+    # Included by:
+    #   - Lutaml::Xml::Serialization::InstanceMethods (Serialize instances)
+    #   - Plain model classes via add_format_specific_model_methods
+    #
+    # Enables Lutaml::Model to check ordering capability with is_a? instead
+    # of respond_to?, following proper OOP type-checking.
+    module XmlOrderable
+      attr_accessor :element_order, :attribute_order, :ordered, :mixed
+    end
+  end
+end

data/lib/lutaml/xml.rb

@@ -42,16 +42,13 @@ module Lutaml
     # XML Schema modules
     autoload :Schema, "#{__dir__}/xml/schema"
 
-    # Detect available XML adapter
-    # @return [Symbol, nil] :nokogiri, :ox, :oga, :rexml, or nil
+    # Detect available XML adapter.
+    # Delegates to moxml, which is the authority on XML adapter
+    # availability and platform constraints.
+    #
+    # @return [Symbol] adapter type name
     def self.detect_xml_adapter
-      return :oga if Lutaml::Model::RuntimeCompatibility.opal?
-      return :nokogiri if Lutaml::Model::Utils.safe_load("nokogiri", :Nokogiri)
-      return :ox if Lutaml::Model::Utils.safe_load("ox", :Ox)
-      return :oga if Lutaml::Model::Utils.safe_load("oga", :Oga)
-      return :rexml if Lutaml::Model::Utils.safe_load("rexml", :REXML)
-
-      nil
+      Moxml::Config.runtime_default_adapter
     end
 
     # Get the current XML adapter
@@ -137,7 +134,6 @@ module Lutaml
     autoload :ElementPrefixResolver, "#{__dir__}/xml/element_prefix_resolver"
     autoload :FormatChooser, "#{__dir__}/xml/format_chooser"
     autoload :HoistingAlgorithm, "#{__dir__}/xml/hoisting_algorithm"
-    autoload :HoistingAlgorithm, "#{__dir__}/xml/hoisting_algorithm"
     autoload :NamespaceInheritanceResolver,
              "#{__dir__}/xml/namespace_inheritance_resolver"
     autoload :NamespaceScopeConfig, "#{__dir__}/xml/namespace_scope_config"
@@ -174,8 +170,8 @@ Lutaml::Model::FormatRegistry.register(
   ],
   adapter_options: if Lutaml::Model::RuntimeCompatibility.opal?
                      {
-                       available: %i[oga],
-                       default: :oga,
+                       available: %i[rexml],
+                       default: :rexml,
                      }
                    else
                      {
@@ -232,7 +228,7 @@ end
 Lutaml::Model::Attribute.format_specific_warn_names.push(:element_order,
                                                          :schema_location, :encoding, :doctype, :ordered?, :mixed?)
 
-# Prepend XML-specific Collection overrides (no_root handling for XML)
+# Prepend XML-specific Collection overrides (unwrapped collection handling for XML)
 require_relative "xml/serialization/collection_ext"
 Lutaml::Model::Collection.singleton_class.prepend(
   Lutaml::Xml::Serialization::CollectionExt,

data/lib/lutaml/yaml/adapter/mapping.rb

@@ -8,10 +8,8 @@ module Lutaml
           super(:yaml)
         end
 
-        def deep_dup
-          self.class.new.tap do |new_mapping|
-            new_mapping.mappings = duplicate_mappings
-          end
+        def dup_instance
+          self.class.new
         end
       end
     end

data/lib/lutaml/yamls/adapter/mapping.rb

@@ -4,7 +4,7 @@ module Lutaml
   module Yamls
     module Adapter
       class Mapping < Lutaml::KeyValue::Mapping
-        attr_reader :yamls_sequence
+        attr_accessor :yamls_sequence
 
         def initialize
           super(:yaml)
@@ -15,9 +15,13 @@ module Lutaml
           @yamls_sequence.instance_eval(&)
         end
 
+        def dup_instance
+          self.class.new
+        end
+
         def deep_dup
-          self.class.new.tap do |new_mapping|
-            new_mapping.mappings = duplicate_mappings
+          super.tap do |new_mapping|
+            new_mapping.yamls_sequence = @yamls_sequence&.dup
           end
         end
       end

data/lib/tasks/memory_profile.rb

@@ -18,7 +18,7 @@ class Address < Lutaml::Model::Serializable
   attribute :country, :string
 
   xml do
-    root "address"
+    element "address"
     map_element "street", to: :street
     map_element "city", to: :city
     map_element "zip", to: :zip
@@ -37,7 +37,7 @@ class Person < Lutaml::Model::Serializable
   attribute :tags, :string, collection: true
 
   xml do
-    root "person"
+    element "person"
     map_attribute "id", to: :id
     map_element "first_name", to: :first_name
     map_element "last_name", to: :last_name

data/lib/tasks/performance_benchmark.rb

@@ -21,7 +21,7 @@ module Lutaml
           attribute :created_at, :date_time
 
           xml do
-            root "simple"
+            element "simple"
             map_attribute "id", to: :id
             map_element "name", to: :name
             map_element "active", to: :active
@@ -46,7 +46,7 @@ module Lutaml
           attribute :country, :string
 
           xml do
-            root "address"
+            element "address"
             map_element "street", to: :street
             map_element "city", to: :city
             map_element "zip", to: :zip
@@ -73,7 +73,7 @@ module Lutaml
           attribute :tags, :string, collection: true
 
           xml do
-            root "person"
+            element "person"
             map_attribute "id", to: :id
             map_element "first_name", to: :first_name
             map_element "last_name", to: :last_name
@@ -103,7 +103,7 @@ module Lutaml
           attribute :price, :float
 
           xml do
-            root "item"
+            element "item"
             map_attribute "product_id", to: :product_id
             map_element "quantity", to: :quantity
             map_element "price", to: :price
@@ -118,7 +118,7 @@ module Lutaml
           attribute :status, :string
 
           xml do
-            root "order"
+            element "order"
             map_attribute "id", to: :id
             map_element "customer", to: :customer
             map_element "item", to: :items

data/lutaml-model.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "canon"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "liquid", ">= 4.0", "< 6.0"
-  spec.add_dependency "moxml", ">= 0.1.20"
+  spec.add_dependency "moxml", ">= 0.1.22"
   spec.add_dependency "ostruct"
   spec.add_dependency "rubyzip", "~> 2.3"
   spec.add_dependency "thor"

data/spec/lutaml/key_value/transformation/rule_compiler_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Lutaml::KeyValue::Transformation::RuleCompiler do
       attribute :active, :boolean
 
       json do
-        root "person"
+        key "person"
         map "name", to: :name
         map "age", to: :age
         map "active", to: :active

data/spec/lutaml/key_value/transformation/value_serializer_spec.rb

@@ -91,7 +91,7 @@ RSpec.describe Lutaml::KeyValue::Transformation::ValueSerializer do
         Class.new(Lutaml::Model::Serializable) do
           attribute :name, :string
           json do
-            root "nested"
+            key "nested"
             map "name", to: :name
           end
         end

data/spec/lutaml/model/attribute_collection_spec.rb

@@ -19,7 +19,7 @@ module AttributeCollection
     end
 
     key_value do
-      root "titles"
+      key "titles"
       map_instances to: :title_parts
     end
 

data/spec/lutaml/model/cli_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe Lutaml::Model::Cli do
         attribute :extract_language, ExtractLanguage, collection: true
 
         xml do
-          root "termium_extract"
+          element "termium_extract"
           namespace TermiumNamespace
 
           map_attribute "language", to: :language, namespace: nil

data/spec/lutaml/model/collection_spec.rb

@@ -156,7 +156,7 @@ class PolyAnimalCollectionAny < Lutaml::Model::Collection
   end
 
   key_value do
-    root "zoo"
+    key "zoo"
     map_instances to: :animals, polymorphic: {
       attribute: "type",
       class_map: {

data/spec/lutaml/model/collection_validation_spec.rb

@@ -10,7 +10,7 @@ module CollectionValidationTests
     attribute :category, :string
 
     xml do
-      root "publication"
+      element "publication"
       map_attribute "id", to: :id
       map_element "title", to: :title
       map_element "year", to: :year
@@ -33,7 +33,7 @@ module CollectionValidationTests
     validates_uniqueness_of :id, message: "Publication IDs must be unique"
 
     xml do
-      root "publications"
+      element "publications"
       map_element "publication", to: :publications
     end
 
@@ -49,7 +49,7 @@ module CollectionValidationTests
     validates_max_count 5, message: "Cannot have more than 5 publications"
 
     xml do
-      root "publications"
+      element "publications"
       map_element "publication", to: :publications
     end
 
@@ -66,7 +66,7 @@ module CollectionValidationTests
     validates_all_present :year, message: "All publications must have a year"
 
     xml do
-      root "publications"
+      element "publications"
       map_element "publication", to: :publications
     end
 
@@ -102,7 +102,7 @@ module CollectionValidationTests
     end
 
     xml do
-      root "publications"
+      element "publications"
       map_element "publication", to: :publications
     end
 
@@ -122,7 +122,7 @@ module CollectionValidationTests
     validates_min_count 1                                    # Collection-level validation
 
     xml do
-      root "publications"
+      element "publications"
       map_element "publication", to: :publications
     end
 

data/spec/lutaml/model/consolidation_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe "Consolidation Mapping" do
         attribute :content, :string
 
         xml do
-          root "title"
+          element "title"
           map_attribute "lang", to: :lang
           map_attribute "type", to: :type_of_title
           map_content to: :content
@@ -40,7 +40,7 @@ RSpec.describe "Consolidation Mapping" do
         organizes :per_lang, ConPerLangGroup
 
         xml do
-          root "titles"
+          element "titles"
           map_instances to: :items
           consolidate_map by: :lang, to: :per_lang do
             gather :lang, to: :lang
@@ -59,7 +59,7 @@ RSpec.describe "Consolidation Mapping" do
         attribute :titles, ConTitle, collection: ConTitleCollection
 
         xml do
-          root "bibdata"
+          element "bibdata"
           map_element "title", to: :titles
         end
       end)
@@ -141,7 +141,7 @@ RSpec.describe "Consolidation Mapping" do
         attribute :content, :string
 
         xml do
-          root "title"
+          element "title"
           map_attribute "lang", to: :lang
           map_attribute "type", to: :type_of_title
           map_content to: :content
@@ -159,7 +159,7 @@ RSpec.describe "Consolidation Mapping" do
         organizes :per_type, ConPerTypeGroup
 
         xml do
-          root "titles"
+          element "titles"
           map_instances to: :items
           consolidate_map by: :type_of_title, to: :per_type do
             gather :type_of_title, to: :type_of_title
@@ -175,7 +175,7 @@ RSpec.describe "Consolidation Mapping" do
         attribute :titles, ConTitle2, collection: ConTitleCollection2
 
         xml do
-          root "bibdata"
+          element "bibdata"
           map_element "title", to: :titles
         end
       end)
@@ -247,7 +247,7 @@ RSpec.describe "Consolidation Mapping" do
         organizes :entries, group_class
 
         xml do
-          root "test"
+          element "test"
           consolidate_map by: :lang, to: :entries do
             gather :lang, to: :lang
             dispatch_by :type do
@@ -276,7 +276,7 @@ RSpec.describe "Consolidation Mapping" do
         organizes :entries, entry_class
 
         xml do
-          root "test"
+          element "test"
           consolidate_map by: :pattern, to: :entries do
             map_element "member", to: :name
             map_element "member_key", to: :key