lutaml-model 0.6.6 → 0.7.1

data/spec/lutaml/model/custom_serialization_spec.rb

@@ -67,8 +67,8 @@ class CustomSerialization < Lutaml::Model::Serializable
     doc.add_element(parent, el)
   end
 
-  def name_from_xml(model, value)
-    model.full_name = value.text.sub(/^XML Masterpiece: /, "")
+  def name_from_xml(model, values)
+    model.full_name = values.first.text.sub(/^XML Masterpiece: /, "")
   end
 
   def size_to_xml(model, parent, doc)
@@ -85,8 +85,8 @@ class CustomSerialization < Lutaml::Model::Serializable
     doc.add_element(parent, color_element)
   end
 
-  def color_from_xml(model, value)
-    model.color = value.text.downcase
+  def color_from_xml(model, values)
+    model.color = values.first.text.downcase
   end
 
   def description_to_xml(model, parent, doc)
@@ -118,8 +118,8 @@ class GrammarInfo < Lutaml::Model::Serializable
     doc["part_of_speech"] = model.part_of_speech
   end
 
-  def part_of_speech_from_xml(model, node)
-    model.part_of_speech = node.text
+  def part_of_speech_from_xml(model, nodes)
+    model.part_of_speech = nodes.first.text
   end
 
   def part_of_speech_to_xml(model, parent, doc)

data/spec/lutaml/model/defaults_spec.rb

@@ -143,7 +143,7 @@ RSpec.describe DefaultsSpec::Glaze do
       expect(default_model.temperature).to eq(1050)
       expect(default_model.firing_time).to eq(60)
       expect(default_model.balance).to eq(BigDecimal("0.0"))
-      expect(default_model.tags).to eq([])
+      expect(default_model.tags).to be_nil
       expect(default_model.properties).to eq({ food_safe: true })
       expect(default_model.status).to eq("active")
       expect(default_model.batch_number).to eq(0)

data/spec/lutaml/model/enum_spec.rb

@@ -5,7 +5,7 @@ module EnumSpec
   class WithEnum < Lutaml::Model::Serializable
     attribute :without_enum, :string
     attribute :single_value, :string, values: %w[user admin super_admin]
-    attribute :multi_value, :string, values: %w[singular dual plural], collection: true
+    attribute :multi_value, :string, values: %w[singular dual plural], collection: true, initialize_empty: true
   end
 end
 

data/spec/lutaml/model/group_spec.rb

@@ -3,14 +3,19 @@ require "lutaml/model"
 
 module GroupSpec
   class Ceramic < Lutaml::Model::Serializable
-    attribute :type, :string
-    attribute :name, :string
+    attribute :type, :string, default: "Data"
+    attribute :name, :string, default: "Starc"
 
     xml do
       no_root
       map_element :type, to: :type
       map_element :name, to: :name
     end
+
+    key_value do
+      map :type, to: :type
+      map :name, to: :name
+    end
   end
 
   class CeramicCollection < Lutaml::Model::Serializable
@@ -75,9 +80,139 @@ module GroupSpec
       map_element :name, to: :name
     end
   end
+
+  class CommonAttributes < Lutaml::Model::Serializable
+    choice do
+      attribute :mstyle, :string
+      attribute :mcol, :string
+      attribute :mr, :string
+    end
+
+    xml do
+      no_root
+      sequence do
+        map_element :mstyle, to: :mstyle
+        map_element :mr, to: :mr
+      end
+      map_attribute :mcol, to: :mcol
+    end
+  end
+
+  class Mrow < Lutaml::Model::Serializable
+    attribute :mi, :string
+    import_model CommonAttributes
+
+    xml do
+      root "mrow"
+      map_element :mi, to: :mi
+    end
+
+    import_model GroupOfItems
+
+    key_value do
+      map :mcol, to: :mcol
+    end
+
+    import_model Ceramic
+  end
+
+  class Mfrac < Lutaml::Model::Serializable
+    attribute :num, :string
+    import_model CommonAttributes
+
+    xml do
+      root "mfrac"
+      map_element :num, to: :num
+    end
+  end
+
+  class ContributionInfo < Lutaml::Model::Serializable
+    attribute :person, :string
+    attribute :organization, :string
+
+    xml do
+      no_root
+      map_element "person", to: :person
+      map_element "organization", to: :organization
+    end
+  end
+
+  class Contributor < Lutaml::Model::Serializable
+    attribute :role, :string
+    import_model_attributes ContributionInfo
+
+    xml do
+      root "contributor"
+      map_element "role", to: :role
+      map_element "person", to: :person
+      map_element "organization", to: :organization
+    end
+  end
+
+  class Identifier < Lutaml::Model::Serializable
+    attribute :id, :string
+    attribute :remarks, :string, collection: true
+    attribute :remark_items, :string, collection: true
+
+    key_value do
+      map "id", to: :id
+      map "remarks", to: :remarks
+      map "remark_items", to: :remark_items
+    end
+  end
+
+  class ModelElement < Lutaml::Model::Serializable
+    import_model Identifier
+  end
 end
 
 RSpec.describe "Group" do
+  context "when serializing and deserializing import model having no_root" do
+    let(:xml) do
+      <<~XML
+        <mrow xmlns:ex1="http://www.example.com" xmlns:GML="http://www.sparxsystems.com/profiles/GML/1.0">
+          <mstyle>italic</mstyle>
+          <mr>y</mr>
+          <mi>x</mi>
+          <name>Smith</name>
+          <type>product</type>
+          <GML:description>Item</GML:description>
+        </mrow>
+      XML
+    end
+
+    let(:input_xml) do
+      <<~XML
+        <contributor>
+          <role>author</role>
+          <person>John Doe</person>
+          <organization>ACME</organization>
+        </contributor>
+      XML
+    end
+
+    it "parse the imported model correctly" do
+      parsed = GroupSpec::Mrow.from_xml(xml)
+      expect(parsed.mi).to eq("x")
+      expect(parsed.mstyle).to eq("italic")
+      expect(parsed.name).to eq("Smith")
+      expect(parsed.type).to eq("product")
+      expect(parsed.description).to eq("Item")
+    end
+
+    it "parse the imported model attributes correctly" do
+      parsed = GroupSpec::Contributor.from_xml(input_xml)
+      expect(parsed.person).to eq("John Doe")
+      expect(parsed.role).to eq("author")
+      expect(parsed.organization).to eq("ACME")
+    end
+
+    it "serialize the imported model correctly" do
+      instance = GroupSpec::Mrow.new(mi: "x", mstyle: "italic", mr: "y", name: "Smith", type: "product", description: "Item")
+      expect(instance.to_xml).to be_equivalent_to(xml)
+    end
+  end
+
   context "with no_root" do
     let(:mapper) { GroupSpec::CeramicCollection }
 
@@ -116,26 +251,193 @@ RSpec.describe "Group" do
   end
 
   context "with model" do
-    it "import attributes" do
-      expect(GroupSpec::ComplexType.attributes).to include(GroupSpec::GroupOfItems.attributes)
+    shared_examples "imports attributes from" do |source_class, target_class|
+      it "#{source_class.name} correctly" do
+        source_attributes = source_class.attributes
+        target_attributes = target_class.attributes
+
+        source_attributes.each do |name, attr|
+          expect(target_attributes[name].name).to eq(attr.name)
+          expect(target_attributes[name].type).to eq(attr.type)
+          expect(target_attributes[name].options).to eq(attr.options)
+        end
+      end
     end
 
-    it "import mappings in xml block" do
-      expect(GroupSpec::ComplexType.mappings_for(:xml).elements).to include(*GroupSpec::GroupOfItems.mappings_for(:xml).elements)
+    shared_examples "imports mappings from" do |source_class, target_class|
+      it "#{source_class.name} correctly" do
+        source_elements = source_class.mappings_for(:xml).elements
+        target_elements = target_class.mappings_for(:xml).elements
+
+        source_elements.each do |element|
+          matching_element = target_elements.find { |e| e.name == element.name }
+          expect(matching_element).not_to be_nil
+          expect(matching_element.to).to eq(element.to)
+        end
+      end
+    end
+
+    describe GroupSpec::ComplexType do
+      it_behaves_like "imports attributes from", GroupSpec::GroupOfItems, described_class
+      it_behaves_like "imports mappings from", GroupSpec::GroupOfItems, described_class
+    end
+
+    describe GroupSpec::GenericType do
+      it_behaves_like "imports mappings from", GroupSpec::GroupOfItems, described_class
+    end
+
+    describe GroupSpec::SimpleType do
+      it_behaves_like "imports attributes from", GroupSpec::GroupOfItems, described_class
+      it_behaves_like "imports mappings from", GroupSpec::GroupOfItems, described_class
+    end
+
+    describe GroupSpec::ModelElement do
+      it_behaves_like "imports attributes from", GroupSpec::Identifier, described_class
+      it_behaves_like "imports mappings from", GroupSpec::Identifier, described_class
+    end
+
+    describe GroupSpec::Mrow do
+      it_behaves_like "imports attributes from", GroupSpec::CommonAttributes, described_class
+      it_behaves_like "imports attributes from", GroupSpec::Ceramic, described_class
+      it_behaves_like "imports mappings from", GroupSpec::CommonAttributes, described_class
+      it_behaves_like "imports mappings from", GroupSpec::Ceramic, described_class
+    end
+
+    describe GroupSpec::Contributor do
+      it_behaves_like "imports attributes from", GroupSpec::ContributionInfo, described_class
     end
 
-    it "import mappings outside xml block" do
-      expect(GroupSpec::GenericType.mappings_for(:xml).elements).to include(*GroupSpec::GroupOfItems.mappings_for(:xml).elements)
+    context "when importing multiple models with overlapping attributes" do
+      let(:mrow_instance) do
+        GroupSpec::Mrow.new
+      end
+
+      it "uses Ceramic's default values for overlapping attributes" do
+        expect(mrow_instance.type).to eq("Data")
+        expect(mrow_instance.name).to eq("Starc")
+      end
+
+      it "maintains the correct XML serialization order from last import" do
+        xml = mrow_instance.to_xml
+        expected_xml = "<mrow xmlns:ex1='http://www.example.com' xmlns:GML='http://www.sparxsystems.com/profiles/GML/1.0'/>"
+
+        expect(xml).to be_equivalent_to(expected_xml)
+      end
     end
 
-    it "import attributes and mappings in xml block" do
-      expect(GroupSpec::ComplexType.attributes).to include(GroupSpec::GroupOfItems.attributes)
-      expect(GroupSpec::ComplexType.mappings_for(:xml).elements).to include(*GroupSpec::GroupOfItems.mappings_for(:xml).elements)
+    context "when update the imported attribute" do
+      it "updates the attribute `mstyle` only in `Mrow`" do
+        GroupSpec::Mrow.attributes[:mstyle].instance_variable_set(:@type, :integer)
+        expect(GroupSpec::Mrow.attributes[:mstyle].type).to eq(:integer)
+      end
+
+      it "maintains original type for the attribute `mstyle` in `Mfrac`" do
+        expect(GroupSpec::Mfrac.attributes[:mstyle].type).to eq(Lutaml::Model::Type::String)
+      end
+
+      it "maintains original type for the attribute `mstyle` in importable class `CommonAttributes`" do
+        expect(GroupSpec::CommonAttributes.attributes[:mstyle].type).to eq(Lutaml::Model::Type::String)
+      end
+    end
+
+    context "when updating imported choice" do
+      it "updates choice min/max only in Mrow" do
+        choice = GroupSpec::Mrow.choice_attributes.first
+        choice.instance_variable_set(:@min, 2)
+        choice.instance_variable_set(:@max, 3)
+
+        expect(choice.min).to eq(2)
+        expect(choice.max).to eq(3)
+      end
+
+      it "maintains original choice min/max in Mfrac" do
+        choice = GroupSpec::Mfrac.choice_attributes.first
+        expect(choice.min).to eq(1)
+        expect(choice.max).to eq(1)
+      end
+
+      it "maintains original choice min/max in CommonAttributes" do
+        choice = GroupSpec::CommonAttributes.choice_attributes.first
+        expect(choice.min).to eq(1)
+        expect(choice.max).to eq(1)
+      end
     end
 
-    it "import attributes and mappings outside the xml block" do
-      expect(GroupSpec::SimpleType.attributes).to include(GroupSpec::GroupOfItems.attributes)
-      expect(GroupSpec::SimpleType.mappings_for(:xml).elements).to include(*GroupSpec::GroupOfItems.mappings_for(:xml).elements)
+    context "when updating imported mappings" do
+      let(:new_namespace) { "http://www.example.com/new" }
+      let(:new_prefix) { "test" }
+
+      context "with element mappings" do
+        it "updates the mapping namespace only in `Mrow`" do
+          mapping = GroupSpec::Mrow.mappings_for(:xml).elements.find { |e| e.name == :mstyle }
+          mapping.instance_variable_set(:@namespace, new_namespace)
+          mapping.instance_variable_set(:@prefix, new_prefix)
+
+          expect(mapping.namespace).to eq(new_namespace)
+          expect(mapping.prefix).to eq(new_prefix)
+        end
+
+        it "maintains original namespace for `mstyle` mapping in `Mfrac`" do
+          mapping = GroupSpec::Mfrac.mappings_for(:xml).elements.find { |e| e.name == :mstyle }
+          expect(mapping.namespace).to be_nil
+          expect(mapping.prefix).to be_nil
+        end
+
+        it "maintains original namespace for `mstyle` mapping in `CommonAttributes`" do
+          mapping = GroupSpec::CommonAttributes.mappings_for(:xml).elements.find { |e| e.name == :mstyle }
+          expect(mapping.namespace).to be_nil
+          expect(mapping.prefix).to be_nil
+        end
+      end
+
+      context "with attribute mappings" do
+        it "updates attribute mapping only in `Mrow`" do
+          mapping = GroupSpec::Mrow.mappings_for(:xml).attributes.find { |a| a.name == :mcol }
+          mapping.instance_variable_set(:@namespace, new_namespace)
+
+          expect(mapping.namespace).to eq(new_namespace)
+        end
+
+        it "maintains original attribute mapping in `Mfrac`" do
+          mapping = GroupSpec::Mfrac.mappings_for(:xml).attributes.find { |a| a.name == :mcol }
+          expect(mapping.namespace).to be_nil
+        end
+
+        it "maintains original attribute mapping in `CommonAttributes`" do
+          mapping = GroupSpec::CommonAttributes.mappings_for(:xml).attributes.find { |a| a.name == :mcol }
+          expect(mapping.namespace).to be_nil
+        end
+      end
+
+      context "with sequence elements" do
+        it "updates sequence elements only in `Mrow`" do
+          sequence = GroupSpec::Mrow.mappings_for(:xml).element_sequence.first
+          sequence.attributes << Lutaml::Model::XmlMappingRule.new(
+            "new_element",
+            to: :new_element,
+            namespace: "http://example.com",
+            prefix: "test",
+          )
+
+          expect(sequence.attributes.map(&:name)).to include("new_element")
+        end
+
+        it "maintains original sequence elements in `Mfrac`" do
+          original_sequence = GroupSpec::Mfrac.mappings_for(:xml).element_sequence.first
+          expect(original_sequence.attributes.map(&:name)).not_to include("new_element")
+        end
+
+        it "maintains original sequence elements in `CommonAttributes`" do
+          original_sequence = GroupSpec::CommonAttributes.mappings_for(:xml).element_sequence.first
+          expect(original_sequence.attributes.map(&:name)).not_to include("new_element")
+        end
+
+        it "creates new sequence object with the new mapping object as model of sequence in `Mrow`" do
+          mrow_sequence_model = GroupSpec::Mrow.mappings_for(:xml).element_sequence[0].model
+          common_attributes_sequence_model = GroupSpec::CommonAttributes.mappings_for(:xml).element_sequence[0].model
+          expect(mrow_sequence_model).not_to be(common_attributes_sequence_model)
+        end
+      end
     end
 
     it "raises error if root is defined on imported class" do

data/spec/lutaml/model/key_value_mapping_spec.rb

@@ -1,9 +1,7 @@
 require "spec_helper"
-require_relative "../../../lib/lutaml/model/key_value_mapping"
-require_relative "../../../lib/lutaml/model/key_value_mapping_rule"
 
 RSpec.describe Lutaml::Model::KeyValueMapping do
-  let(:mapping) { described_class.new }
+  let(:mapping) { described_class.new(:json) }
 
   context "with delegate option" do
     before do
@@ -49,6 +47,10 @@ RSpec.describe Lutaml::Model::KeyValueMapping do
       expect(dup_mapping.object_id).not_to eq(mapping.object_id)
     end
 
+    it "correctly duplicates mapping with format" do
+      expect(mapping.format).to eq(dup_mapping.format)
+    end
+
     it "correctly duplicates mapping with `to:`" do
       m = mapping.mappings[0]
       dup_m = dup_mapping.mappings[0]
@@ -67,6 +69,8 @@ RSpec.describe Lutaml::Model::KeyValueMapping do
 
       expect(m.child_mappings).to eq(dup_m.child_mappings)
       expect(m.child_mappings.object_id).not_to eq(dup_m.child_mappings.object_id)
+
+      expect(m.format).to eq(dup_m.format)
     end
 
     it "correctly duplicates mapping with custom methods" do
@@ -98,4 +102,38 @@ RSpec.describe Lutaml::Model::KeyValueMapping do
       expect(mapping.mappings[0].raw_mapping?).to be true
     end
   end
+
+  describe "validation errors" do
+    it "raises error when render_nil is :as_blank" do
+      mapping = described_class.new
+      expect do
+        mapping.map("test", to: :field, render_nil: :as_blank)
+      end.to raise_error(
+        Lutaml::Model::IncorrectMappingArgumentsError,
+        ":as_blank is not supported for key-value mappings",
+      )
+    end
+
+    context "with TOML format" do
+      let(:mapping) { Lutaml::Model::TomlMapping.new }
+
+      it "raises error when render_nil is :as_nil" do
+        expect do
+          mapping.map("test", to: :field, render_nil: :as_nil)
+        end.to raise_error(
+          Lutaml::Model::IncorrectMappingArgumentsError,
+          "nil values are not supported in toml format",
+        )
+      end
+
+      it "raises error when render_empty is :as_nil" do
+        expect do
+          mapping.map("test", to: :field, render_empty: :as_nil)
+        end.to raise_error(
+          Lutaml::Model::IncorrectMappingArgumentsError,
+          "nil values are not supported in toml format",
+        )
+      end
+    end
+  end
 end

data/spec/lutaml/model/multiple_mapping_spec.rb

@@ -105,8 +105,8 @@ module MultipleMapping
       doc.add_element(parent, el)
     end
 
-    def name_from_xml(model, value)
-      model.full_name = value.text.sub(/^XML Model: /, "")
+    def name_from_xml(model, values)
+      model.full_name = values.first.text.sub(/^XML Model: /, "")
     end
 
     def color_to_xml(model, parent, doc)
@@ -115,8 +115,8 @@ module MultipleMapping
       doc.add_element(parent, el)
     end
 
-    def color_from_xml(model, value)
-      model.color = value.text.downcase
+    def color_from_xml(model, values)
+      model.color = values.first.text.downcase
     end
 
     def size_to_xml(model, parent, doc)
@@ -125,8 +125,8 @@ module MultipleMapping
       doc.add_element(parent, el)
     end
 
-    def size_from_xml(model, value)
-      model.size = (value.text.to_i || 0) - 10
+    def size_from_xml(model, values)
+      model.size = (values.first.text.to_i || 0) - 10
     end
 
     def desc_to_xml(model, parent, doc)
@@ -135,8 +135,8 @@ module MultipleMapping
       doc.add_element(parent, el)
     end
 
-    def desc_from_xml(model, value)
-      model.description = value.text.sub(/^XML Description: /, "")
+    def desc_from_xml(model, values)
+      model.description = values.first.text.sub(/^XML Description: /, "")
     end
   end
 end