lutaml-model 0.8.12 → 0.8.13

data/spec/lutaml/model/register_methods_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe "Register-specific attribute methods" do
       attribute :name, :string
 
       xml do
-        root "Base"
+        element "Base"
         map_element "Name", to: :name
       end
     end
@@ -25,7 +25,7 @@ RSpec.describe "Register-specific attribute methods" do
       attribute :priority, :integer
 
       xml do
-        root "Extension"
+        element "Extension"
         map_element "Version", to: :version
         map_element "Priority", to: :priority
       end

data/spec/lutaml/model/render_empty_spec.rb

@@ -80,7 +80,7 @@ module RenderEmptySpec
     attribute :page, :string
 
     xml do
-      root "doc"
+      element "doc"
       map_attribute "code", to: :code
       map_attribute "page", to: :page,
                             value_map: { to: { empty: :empty } }

data/spec/lutaml/model/serialize_perf_guard_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe "Lazy nil deserialization state guard specs" do
       attribute :tags, :string, collection: true
 
       xml do
-        root "model"
+        element "model"
         map_element "name", to: :name
         map_attribute "age", to: :age
         map_element "tag", to: :tags

data/spec/lutaml/model/transform_dynamic_attributes_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe "Transform with dynamically added attributes" do
       attribute :name, :string
 
       xml do
-        root "test"
+        element "test"
         map_element "name", to: :name
       end
 

data/spec/lutaml/model/transformation_builder_spec.rb

@@ -63,7 +63,7 @@ RSpec.describe Lutaml::Xml::TransformationBuilder do
         attribute :name, :string
 
         xml do
-          root "person"
+          element "person"
           map_element "name", to: :name
         end
       end
@@ -222,7 +222,7 @@ RSpec.describe "TransformationRegistry Builder Pattern" do
         attribute :name, :string
 
         xml do
-          root "person"
+          element "person"
           map_element "name", to: :name
         end
 

data/spec/lutaml/model/xml_decoupling_spec.rb

@@ -55,7 +55,7 @@ RSpec.describe "XML decoupling from core model" do
       end
 
       xml do
-        root "item"
+        element "item"
         map_element "title", to: :title
         map_element "count", to: :count
       end
@@ -328,8 +328,8 @@ RSpec.describe "XML decoupling from core model" do
       expect(Lutaml::Model::Collection).to respond_to(:collection_structured_format?)
     end
 
-    it "Collection has collection_no_root_to? hook" do
-      expect(Lutaml::Model::Collection).to respond_to(:collection_no_root_to?)
+    it "Collection has collection_unwrapped_to? hook" do
+      expect(Lutaml::Model::Collection).to respond_to(:collection_unwrapped_to?)
     end
 
     it "collection_structured_format? returns true for XML" do

data/spec/lutaml/model/xsd_patterns_spec.rb

@@ -196,7 +196,7 @@ RSpec.describe "XSD Three Pattern Architecture" do
       expect(xsd1).to include('<complexType name="TestType">')
     end
 
-    it "xsd_type does NOT auto-set no_root (NO MAGIC)" do
+    it "xsd_type does NOT auto-set type-only (NO MAGIC)" do
       klass = Class.new(Lutaml::Model::Serializable) do
         attribute :name, :string
 
@@ -208,9 +208,8 @@ RSpec.describe "XSD Three Pattern Architecture" do
       end
 
       mapping = klass.mappings_for(:xml)
-      # NO MAGIC: xsd_type doesn't set @no_root
-      expect(mapping.instance_variable_get(:@no_root)).to be_nil
       # Model is a root model because element is declared
+      expect(mapping.no_element?).to be false
       expect(mapping.no_root?).to be false
       # Type name is still set
       expect(mapping.type_name_value).to eq("TestType")

data/spec/lutaml/xml/adapter/order_spec.rb

@@ -11,7 +11,7 @@ module XmlAdapterSharedFeaturesSpec
     attribute :foo, :string
 
     xml do
-      root "root"
+      element "root"
       map_element "foo", to: :foo
     end
   end

data/spec/lutaml/xml/clear_parse_state_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe "#clear_xml_parse_state!" do
       attribute :count, :integer
 
       xml do
-        root "root"
+        element "root"
         namespace ns
         map_element "item", to: :item
         map_attribute "count", to: :count

data/spec/lutaml/xml/content_model_validation_spec.rb

@@ -32,7 +32,8 @@ RSpec.describe "Content model validation" do
           attribute :content, :string
 
           xml do
-            root "test", ordered: true
+            element "test"
+            ordered
             map_content to: :content
           end
 
@@ -85,7 +86,8 @@ RSpec.describe "Content model validation" do
           attribute :content, :string, collection: true
 
           xml do
-            root "test", mixed: true
+            element "test"
+            mixed_content
             map_content to: :content
           end
 

data/spec/lutaml/xml/doubly_defined_namespace_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe "Doubly-defined namespace prefixes" do
       attribute :item, :string
 
       xml do
-        root "root"
+        element "root"
         namespace ns
         map_element "item", to: :item
       end
@@ -171,7 +171,7 @@ RSpec.describe "Doubly-defined namespace prefixes" do
         attribute :name, :string
 
         xml do
-          root "Inner"
+          element "Inner"
           namespace ns
           map_element "name", to: :name
         end
@@ -185,7 +185,7 @@ RSpec.describe "Doubly-defined namespace prefixes" do
         attribute :child, ic
 
         xml do
-          root "Outer"
+          element "Outer"
           namespace ns
           map_element "Inner", to: :child
         end
@@ -269,7 +269,7 @@ RSpec.describe "Doubly-defined namespace prefixes" do
         attribute :value, :string
 
         xml do
-          root "child"
+          element "child"
           namespace ns
           map_content to: :value
         end
@@ -284,7 +284,7 @@ RSpec.describe "Doubly-defined namespace prefixes" do
         attribute :child, cm
 
         xml do
-          root "parent"
+          element "parent"
           namespace ns
           map_element "name", to: :name
           map_element "child", to: :child

data/spec/lutaml/xml/enhanced_mapping_spec.rb

@@ -54,8 +54,9 @@ RSpec.describe "Enhanced XML Mapping Features" do
         expect(mapping.root?).to be false
       end
 
-      it "has no_root? return true for type-only models" do
+      it "has no_element? return true for type-only models" do
         mapping = model_class.mappings_for(:xml)
+        expect(mapping.no_element?).to be true
         expect(mapping.no_root?).to be true
       end
     end

data/spec/lutaml/xml/entity_fragmentation_spec.rb

@@ -10,7 +10,7 @@ module EntityFragmentationSpec
     attribute :content, :string
 
     xml do
-      root "t"
+      element "t"
       namespace OfficeMathNamespace
       map_content to: :content
     end
@@ -20,7 +20,7 @@ module EntityFragmentationSpec
     attribute :t, MathT
 
     xml do
-      root "r"
+      element "r"
       namespace OfficeMathNamespace
       map_element :t, to: :t
     end
@@ -30,7 +30,7 @@ module EntityFragmentationSpec
     attribute :r, MathR
 
     xml do
-      root "oMathPara"
+      element "oMathPara"
       namespace OfficeMathNamespace
       map_element :r, to: :r
     end
@@ -219,7 +219,7 @@ RSpec.shared_examples "XML entity preservation" do |adapter_name|
           element "paragraph"
           mixed_content
 
-          map_content to: :content, mixed: true
+          map_content to: :content
           map_element "em", to: :emphasis
         end
       end
@@ -496,7 +496,7 @@ RSpec.describe "XML Entity Fragmentation Issue #5" do
           attribute :content, :string
 
           xml do
-            root "text"
+            element "text"
             map_content to: :content
           end
         end

data/spec/lutaml/xml/indent_spec.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Indent configuration" do
+  before do
+    item_class = Class.new do
+      include Lutaml::Model::Serialize
+
+      attribute :name, :string
+
+      xml do
+        element "item"
+        map_element "name", to: :name
+      end
+    end
+
+    stub_const("IndentItem", item_class)
+
+    test_class = Class.new do
+      include Lutaml::Model::Serialize
+
+      attribute :title, :string
+      attribute :items, IndentItem, collection: true
+
+      xml do
+        element "container"
+        map_element "title", to: :title
+        map_element "item", to: :items
+      end
+    end
+
+    stub_const("IndentContainer", test_class)
+  end
+
+  let(:model) do
+    IndentContainer.new(
+      title: "Test",
+      items: [IndentItem.new(name: "a"), IndentItem.new(name: "b")],
+    )
+  end
+
+  it "uses default indent of 2 spaces" do
+    xml = model.to_xml
+    expect(xml).to include("  <title>Test</title>")
+    expect(xml).to include("  <item>")
+  end
+
+  it "produces compact output with indent: 0" do
+    xml = model.to_xml(indent: 0)
+    expect(xml).not_to include("\n  ")
+    expect(xml).not_to include("\n    ")
+  end
+
+  it "uses 4-space indent when indent: 4" do
+    xml = model.to_xml(indent: 4)
+    expect(xml).to include("    <title>Test</title>")
+    expect(xml).to include("    <item>")
+  end
+
+  it "nests consistently at multiple levels with indent: 4" do
+    nested_class = Class.new do
+      include Lutaml::Model::Serialize
+
+      attribute :label, :string
+      attribute :child, IndentItem
+
+      xml do
+        element "nested"
+        map_element "label", to: :label
+        map_element "item", to: :child
+      end
+    end
+
+    stub_const("IndentNested", nested_class)
+
+    container = Class.new do
+      include Lutaml::Model::Serialize
+
+      attribute :nested, IndentNested
+
+      xml do
+        element "root"
+        map_element "nested", to: :nested
+      end
+    end
+
+    stub_const("IndentRoot", container)
+
+    instance = IndentRoot.new(
+      nested: IndentNested.new(
+        label: "outer",
+        child: IndentItem.new(name: "inner"),
+      ),
+    )
+
+    xml = instance.to_xml(indent: 4)
+    expect(xml).to include("    <nested>")
+    expect(xml).to include("        <label>outer</label>")
+    expect(xml).to include("        <item>")
+    expect(xml).to include("            <name>inner</name>")
+  end
+
+  it "preserves text content without extra whitespace" do
+    xml = model.to_xml
+    expect(xml).to include("<title>Test</title>")
+    expect(xml).to include("<name>a</name>")
+  end
+end

data/spec/lutaml/xml/line_ending_spec.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Line ending configuration" do
+  before do
+    test_class = Class.new do
+      include Lutaml::Model::Serialize
+
+      attribute :title, :string
+      attribute :body, :string
+
+      xml do
+        element "article"
+        map_element "title", to: :title
+        map_element "body", to: :body
+      end
+    end
+
+    stub_const("LineEndingArticle", test_class)
+  end
+
+  let(:model) { LineEndingArticle.new(title: "Test", body: "Content") }
+
+  it "uses LF (\\n) line endings by default" do
+    xml = model.to_xml
+    expect(xml).not_to include("\r\n")
+  end
+
+  it "produces CRLF when line_ending: CRLF is specified" do
+    xml = model.to_xml(line_ending: "\r\n")
+    lines = xml.split("\n", -1)
+    crlf_count = lines.count { |l| l.end_with?("\r") }
+    expect(crlf_count).to be > 0
+  end
+
+  it "applies line endings consistently across declaration and body" do
+    xml = model.to_xml(line_ending: "\r\n", declaration: true)
+    expect(xml.lines).to all(end_with("\r\n"))
+  end
+
+  it "preserves LF in round-trip" do
+    xml_in = "<article><title>Test</title><body>Content</body></article>"
+    parsed = LineEndingArticle.from_xml(xml_in)
+    xml_out = parsed.to_xml
+    expect(xml_out).not_to include("\r\n")
+  end
+
+  it "does not produce mixed line endings" do
+    xml = model.to_xml(line_ending: "\r\n")
+    crlf_positions = []
+    lf_only_positions = []
+    xml.each_char.with_index do |c, i|
+      next unless c == "\n"
+
+      prev = i > 0 ? xml[i - 1] : nil
+      if prev == "\r"
+        crlf_positions << i
+      else
+        lf_only_positions << i
+      end
+    end
+    # Either all newlines are CRLF or none are — no mixing
+    expect(lf_only_positions).to be_empty, "Mixed line endings found"
+  end
+end

data/spec/lutaml/xml/mapping_finalization_guard_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe "Mapping finalization cache guard specs" do
       attribute :age, :integer
 
       xml do
-        root "person"
+        element "person"
         map_element "name", to: :name
         map_attribute "age", to: :age
       end
@@ -52,7 +52,7 @@ RSpec.describe "Mapping finalization cache guard specs" do
         attribute :email, :string
 
         xml do
-          root "person"
+          element "person"
           map_element "email", to: :email
         end
 

data/spec/lutaml/xml/model_transform_guard_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe "ModelTransform name conversion guard specs" do
       attribute :ns_attr, :string
 
       xml do
-        root "root"
+        element "root"
         map_element "name", to: :name
         map_attribute "ex:attr", to: :ns_attr
       end
@@ -53,7 +53,7 @@ RSpec.describe "ModelTransform name conversion guard specs" do
         attribute :value, :string
 
         xml do
-          root "nested"
+          element "nested"
           map_content to: :value
         end
 
@@ -66,7 +66,7 @@ RSpec.describe "ModelTransform name conversion guard specs" do
         attribute :child, nested_class
 
         xml do
-          root "parent"
+          element "parent"
           map_element "child", to: :child
         end
 
@@ -104,7 +104,7 @@ RSpec.describe "ModelTransform name conversion guard specs" do
         attribute :b, :string
 
         xml do
-          root "root"
+          element "root"
           map_attribute "ns:a", to: :a
           map_attribute "ns:b", to: :b
         end

data/spec/lutaml/xml/namespace_alias_spec.rb

@@ -99,7 +99,7 @@ RSpec.describe "Namespace alias support" do
         attribute :item, :string
 
         xml do
-          root "root"
+          element "root"
           namespace ns
           map_element "item", to: :item
         end
@@ -170,7 +170,7 @@ RSpec.describe "Namespace alias support" do
         attribute :name, :string
 
         xml do
-          root "Inner"
+          element "Inner"
           namespace ns
           map_element "name", to: :name
         end
@@ -184,7 +184,7 @@ RSpec.describe "Namespace alias support" do
         attribute :child, ic
 
         xml do
-          root "Outer"
+          element "Outer"
           namespace ns
           map_element "Inner", to: :child
         end
@@ -236,7 +236,7 @@ RSpec.describe "Namespace alias support" do
         attribute :child_name, :string
 
         xml do
-          root "Parent"
+          element "Parent"
           namespace pns
           map_element "childName", to: :child_name
           namespace cns

data/spec/lutaml/xml/namespace_aware_parsing_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe "Namespace-Aware XML Parsing" do
 
       xml do
         namespace ns
-        root "Model"
+        element "Model"
         map_element "Name", to: :name
         map_element "Version", to: :version
       end
@@ -49,7 +49,7 @@ RSpec.describe "Namespace-Aware XML Parsing" do
 
       xml do
         namespace ns
-        root "Model"
+        element "Model"
         map_element "Title", to: :title
         map_element "Version", to: :version
       end
@@ -63,7 +63,7 @@ RSpec.describe "Namespace-Aware XML Parsing" do
 
       xml do
         namespace ns
-        root "Common"
+        element "Common"
         map_element "Id", to: :id
       end
     end

data/spec/lutaml/xml/namespace_bound_element_roundtrip_spec.rb

@@ -107,7 +107,7 @@ RSpec.describe "Namespace-Aware Round-Trip Serialization" do
       attribute :write_protection, :boolean
 
       xml do
-        root "settings"
+        element "settings"
         namespace w_ns
         namespace_scope [w14_ns, w15_ns]
 
@@ -364,7 +364,7 @@ RSpec.describe "Namespace-Aware Round-Trip Serialization" do
         attribute :author, :string
 
         xml do
-          root "document"
+          element "document"
           namespace simple_ns
 
           map_element "title", to: :title

data/spec/lutaml/xml/namespace_format_preservation_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe "Namespace format preservation" do
       attribute :name, :string
 
       xml do
-        root "TestModel"
+        element "TestModel"
         namespace ns
         map_element "name", to: :name
       end

data/spec/lutaml/xml/namespace_inheritance_spec.rb

@@ -234,7 +234,7 @@ RSpec.describe "XML namespace inheritance" do
       # - Child's parent_ns_attr is in PARENT namespace (different from child) → MUST have prefix
       # - Child's child_ns_attr is in CHILD namespace (same as child) → NO prefix (unqualified)
       expected = <<~XML.chomp
-        <parent:parent xmlns:parent="http://example.com/parent" xmlns:child="http://example.com/child" child:child_ns_attr="value">
+        <parent:parent xmlns:child="http://example.com/child" xmlns:parent="http://example.com/parent" child:child_ns_attr="value">
           <child:child parent:parent_ns_attr="value" child_ns_attr="value">test</child:child>
         </parent:parent>
       XML
@@ -926,7 +926,7 @@ RSpec.describe "XML namespace inheritance" do
       # have NO prefix (inherit from element's namespace context)
       # Type namespace (child_ns_attr) is declared on root for efficiency
       expected = <<~XML.chomp
-        <parent:collection xmlns:parent="http://example.com/parent" xmlns:child="http://example.com/child">
+        <parent:collection xmlns:child="http://example.com/child" xmlns:parent="http://example.com/parent">
           <parent:item parent_ns_attr="value1" child:child_ns_attr="value1">first</parent:item>
           <parent:item parent_ns_attr="value2" child:child_ns_attr="value2">second</parent:item>
           <parent:item parent_ns_attr="value3" child:child_ns_attr="value3">third</parent:item>
@@ -953,7 +953,7 @@ RSpec.describe "XML namespace inheritance" do
       # W3C attributeFormDefault="unqualified": attributes in same namespace as element
       # have NO prefix (inherit from element's namespace context)
       expected = <<~XML.chomp
-        <parent:collection xmlns:parent="http://example.com/parent" xmlns:child="http://example.com/child">
+        <parent:collection xmlns:child="http://example.com/child" xmlns:parent="http://example.com/parent">
           <parent:item parent_ns_attr="value1" child:child_ns_attr="value1">first</parent:item>
           <parent:item parent_ns_attr="value2" child:child_ns_attr="value2">second</parent:item>
           <parent:item parent_ns_attr="value3" child:child_ns_attr="value3">third</parent:item>

data/spec/lutaml/xml/namespace_preservation_spec.rb

@@ -256,7 +256,7 @@ RSpec.describe "Namespace Preservation Issue #3" do
         attribute :title, :string
 
         xml do
-          root "article"
+          element "article"
           namespace article_ns
           map_element "title", to: :title
         end
@@ -299,7 +299,7 @@ RSpec.describe "Namespace Preservation Issue #3" do
         attribute :title, :string
 
         xml do
-          root "article"
+          element "article"
           namespace article_ns
           map_element "title", to: :title
         end
@@ -340,7 +340,7 @@ RSpec.describe "Namespace Preservation Issue #3" do
         attribute :exterior, :string
 
         xml do
-          root "Polygon"
+          element "Polygon"
           namespace gml_ns
           map_element "exterior", to: :exterior
         end
@@ -383,7 +383,7 @@ RSpec.describe "Namespace Preservation Issue #3" do
         attribute :content, :string
 
         xml do
-          root "child"
+          element "child"
           namespace child_ns
           map_content to: :content
         end
@@ -399,7 +399,7 @@ RSpec.describe "Namespace Preservation Issue #3" do
         attribute :child, child_class
 
         xml do
-          root "parent"
+          element "parent"
           map_element "title", to: :title
           map_element "child", to: :child
         end