lutaml-model 0.5.3 → 0.5.4

data/spec/lutaml/model/with_child_mapping_spec.rb

@@ -341,7 +341,7 @@ RSpec.describe ChildMapping do
         actual = Lutaml::Model::Config.toml_adapter.parse(instance.to_toml)
         expected = Lutaml::Model::Config.toml_adapter.parse(toml)
 
-        expect(actual.attributes).to eq(expected.attributes)
+        expect(actual).to eq(expected)
       end
 
       it "converts object to toml with nesting values" do
@@ -349,7 +349,7 @@ RSpec.describe ChildMapping do
         actual = Lutaml::Model::Config.toml_adapter.parse(instance.to_toml)
         expected = Lutaml::Model::Config.toml_adapter.parse(prefixes_toml)
 
-        expect(actual.attributes).to eq(expected.attributes)
+        expect(actual).to eq(expected)
       end
     end
   end

data/spec/lutaml/model/xml_adapter/xml_namespace_spec.rb

@@ -123,6 +123,20 @@ RSpec.shared_context "XML namespace models" do
       map_element "body", to: :body
     end
   end
+
+  class OwnedEnd < Lutaml::Model::Serializable
+    attribute :id, :string
+    attribute :type, :string
+    attribute :uml_type, :string
+
+    xml do
+      root "ownedEnd"
+
+      map_attribute "id", to: :id, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
+      map_attribute "type", to: :type, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
+      map_attribute "type", to: :uml_type
+    end
+  end
 end
 
 RSpec.shared_examples "XML serialization with namespace" do |model_class, xml_string|
@@ -302,6 +316,44 @@ RSpec.shared_examples "an XML namespace parser" do |adapter_class|
       end
     end
   end
+
+  context "when two attributes have same name but different prefix" do
+    let(:xml_input) do
+      <<~XML
+        <ownedEnd xmlns:xmi="http://www.omg.org/spec/XMI/20131001"
+                  xmi:type="xmi_type"
+                  xmi:id="my_id"
+                  type="test" />
+      XML
+    end
+
+    describe "XML serialization" do
+      it "correctly deserializes from XML" do
+        owned_end = OwnedEnd.from_xml(xml_input)
+
+        expect(owned_end.id).to eq("my_id")
+        expect(owned_end.type).to eq("xmi_type")
+        expect(owned_end.uml_type).to eq("test")
+      end
+
+      it "correctly serializes to XML" do
+        owned_end = OwnedEnd.new(
+          id: "my_id",
+          type: "xmi_type",
+          uml_type: "test",
+        )
+
+        expect(owned_end.to_xml).to be_equivalent_to(xml_input)
+      end
+
+      it "round-trips XML" do
+        owned_end = OwnedEnd.from_xml(xml_input)
+        output_xml = owned_end.to_xml
+
+        expect(output_xml).to be_equivalent_to(xml_input)
+      end
+    end
+  end
 end
 
 RSpec.describe Lutaml::Model::XmlAdapter::NokogiriAdapter do

data/spec/lutaml/model/xml_mapping_spec.rb

@@ -131,6 +131,45 @@ module XmlMapping
     end
   end
 
+  class AnnotatedElement < Lutaml::Model::Serializable
+    attribute :idref, :string
+
+    xml do
+      root "annotatedElement"
+      map_attribute "idref", to: :idref, namespace: "http://www.omg.org/spec/XMI/20131001", prefix: "xmi"
+    end
+  end
+
+  class OwnedComment < Lutaml::Model::Serializable
+    attribute :annotated_attribute, :string
+    attribute :annotated_element, AnnotatedElement
+
+    xml do
+      root "ownedComment"
+      map_attribute "annotatedElement", to: :annotated_attribute
+      map_element "annotatedElement", to: :annotated_element, prefix: nil, namespace: nil
+    end
+  end
+
+  class Date < Lutaml::Model::Serializable
+    attribute :type, :string
+    attribute :text, :string
+    attribute :content, :string
+    attribute :from, :string
+    attribute :to, :string
+    attribute :on, :string
+
+    xml do
+      root "date", mixed: true
+      map_attribute "type", to: :type
+      map_attribute "text", to: :text
+      map_content to: :content
+      map_element "from", to: :from
+      map_element "to", to: :to
+      map_element "on", to: :on
+    end
+  end
+
   class OverrideDefaultNamespacePrefix < Lutaml::Model::Serializable
     attribute :same_element_name, SameNameDifferentNamespace
 
@@ -187,7 +226,7 @@ module XmlMapping
     xml do
       root "MapAllWithCustomMethod"
 
-      map_all to: :all_content, with: { to: :content_to_xml, from: :content_from_xml }
+      map_all_content to: :all_content, with: { to: :content_to_xml, from: :content_from_xml }
     end
 
     def content_to_xml(model, parent, doc)
@@ -359,6 +398,69 @@ RSpec.describe Lutaml::Model::XmlMapping do
       end
     end
 
+    context "with same element and attribute name" do
+      let(:xml_with_element) do
+        <<~XML
+          <ownedComment xmlns:xmi="http://www.omg.org/spec/XMI/20131001">
+            <annotatedElement xmi:idref="ABC"/>
+          </ownedComment>
+        XML
+      end
+
+      let(:xml_with_attribute) do
+        <<~XML
+          <ownedComment annotatedElement="test2">
+          </ownedComment>
+        XML
+      end
+
+      let(:xml_with_same_name_attribute_and_element) do
+        <<~XML
+          <ownedComment xmlns:xmi="http://www.omg.org/spec/XMI/20131001" annotatedElement="test2">
+            <annotatedElement xmi:idref="ABC"/>
+          </ownedComment>
+        XML
+      end
+
+      let(:xml) do
+        <<~XML
+          <date type="published">
+            End of December
+            <on>2020-01</on>
+            Start of January
+          </date>
+        XML
+      end
+
+      it "parse and serializes the input xml correctly # lutaml/issues/217" do
+        parsed = XmlMapping::OwnedComment.from_xml(xml_with_element)
+        serialized = parsed.to_xml
+
+        expect(serialized).to be_equivalent_to(xml_with_element.strip)
+      end
+
+      it "parse and serialize model correctly" do
+        parsed = XmlMapping::OwnedComment.from_xml(xml_with_attribute)
+        serialized = parsed.to_xml
+
+        expect(serialized).to be_equivalent_to(xml_with_attribute)
+      end
+
+      it "parse and serialize model correctly with both attribute and element" do
+        parsed = XmlMapping::OwnedComment.from_xml(xml_with_same_name_attribute_and_element)
+        serialized = parsed.to_xml
+
+        expect(serialized).to be_equivalent_to(xml_with_same_name_attribute_and_element)
+      end
+
+      it "testing parse element" do
+        parsed = XmlMapping::Date.from_xml(xml)
+        serialized = parsed.to_xml
+
+        expect(serialized).to be_equivalent_to(xml)
+      end
+    end
+
     context "with same name elements" do
       let(:input_xml) do
         <<~XML
@@ -886,6 +988,11 @@ RSpec.describe Lutaml::Model::XmlMapping do
           # `to` is symbol which are constant so object_id will be same
           expect(orig_mapping.to).to eq(dup_mapping.to)
         end
+
+        it "duplicates attribute" do
+          # boolean value is constant so object_id will be same
+          expect(orig_mappings.attributes.first.attribute?).to eq(dup_mappings.attributes.first.attribute?)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-11 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -57,6 +57,7 @@ files:
 - lib/lutaml/model/comparable_nil.rb
 - lib/lutaml/model/comparison.rb
 - lib/lutaml/model/config.rb
+- lib/lutaml/model/constants.rb
 - lib/lutaml/model/error.rb
 - lib/lutaml/model/error/collection_count_out_of_range_error.rb
 - lib/lutaml/model/error/collection_true_missing_error.rb
@@ -64,6 +65,7 @@ files:
 - lib/lutaml/model/error/invalid_value_error.rb
 - lib/lutaml/model/error/multiple_mappings_error.rb
 - lib/lutaml/model/error/pattern_not_matched_error.rb
+- lib/lutaml/model/error/type/invalid_value_error.rb
 - lib/lutaml/model/error/type_error.rb
 - lib/lutaml/model/error/type_not_enabled_error.rb
 - lib/lutaml/model/error/unknown_adapter_type_error.rb
@@ -83,6 +85,8 @@ files:
 - lib/lutaml/model/schema/json_schema.rb
 - lib/lutaml/model/schema/json_schema_parser.rb
 - lib/lutaml/model/schema/relaxng_schema.rb
+- lib/lutaml/model/schema/templates/simple_type.rb
+- lib/lutaml/model/schema/xml_compiler.rb
 - lib/lutaml/model/schema/xsd_schema.rb
 - lib/lutaml/model/schema/yaml_schema.rb
 - lib/lutaml/model/schema_location.rb
@@ -134,9 +138,13 @@ files:
 - spec/fixtures/person.rb
 - spec/fixtures/sample_model.rb
 - spec/fixtures/vase.rb
+- spec/fixtures/xml/invalid_math_document.xml
 - spec/fixtures/xml/latin_encoding.xml
+- spec/fixtures/xml/math_document_schema.xsd
 - spec/fixtures/xml/shift_jis.xml
 - spec/fixtures/xml/special_char.xml
+- spec/fixtures/xml/test_schema.xsd
+- spec/fixtures/xml/valid_math_document.xml
 - spec/lutaml/model/attribute_spec.rb
 - spec/lutaml/model/cdata_spec.rb
 - spec/lutaml/model/collection_spec.rb
@@ -150,6 +158,7 @@ files:
 - spec/lutaml/model/inheritance_spec.rb
 - spec/lutaml/model/json_adapter_spec.rb
 - spec/lutaml/model/key_value_mapping_spec.rb
+- spec/lutaml/model/map_all_spec.rb
 - spec/lutaml/model/map_content_spec.rb
 - spec/lutaml/model/mixed_content_spec.rb
 - spec/lutaml/model/multiple_mapping_spec.rb
@@ -159,6 +168,7 @@ files:
 - spec/lutaml/model/root_mappings_spec.rb
 - spec/lutaml/model/schema/json_schema_spec.rb
 - spec/lutaml/model/schema/relaxng_schema_spec.rb
+- spec/lutaml/model/schema/xml_compiler_spec.rb
 - spec/lutaml/model/schema/xsd_schema_spec.rb
 - spec/lutaml/model/schema/yaml_schema_spec.rb
 - spec/lutaml/model/serializable_spec.rb