lutaml-model 0.3.25 → 0.3.27

data/spec/lutaml/model/mixed_content_spec.rb

@@ -170,6 +170,15 @@ module MixedContentSpec
       map_element :value, to: :value
     end
   end
+
+  class HexCode < Lutaml::Model::Serializable
+    attribute :content, :string
+
+    xml do
+      root "HexCode"
+      map_content to: :content
+    end
+  end
 end
 
 RSpec.describe "MixedContent" do
@@ -449,7 +458,7 @@ RSpec.describe "MixedContent" do
 
         it "serializes special char mixed content correctly" do
           parsed = MixedContentSpec::SpecialCharContentWithMixedTrue.from_xml(xml)
-          serialized = parsed.to_xml
+          serialized = parsed.to_xml(encoding: "UTF-8")
 
           expect(serialized).to include(expected_xml)
         end
@@ -608,10 +617,68 @@ RSpec.describe "MixedContent" do
         end
       end
     end
+
+    context "when special char used as full entities, it persist as entities if no encoding provided" do
+      let(:xml) do
+        <<~XML
+          <HexCode>
+            &#x2211;computer security&#x220F; type of &#x200B; operation specified &#xB5; by an access right
+          </HexCode>
+        XML
+      end
+
+      describe ".from_xml" do
+        let(:expected_content) { "∑computer security∏ type of ​ operation specified µ by an access right" }
+
+        it "deserializes special char mixed content correctly" do
+          parsed = MixedContentSpec::HexCode.from_xml(xml)
+
+          expect(parsed.content.strip).to eq(expected_content)
+        end
+      end
+
+      describe ".to_xml" do
+        context "when default encoding xml" do
+          let(:expected_default_encoding_xml) { "∑computer security∏ type of ​ operation specified µ by an access right" }
+
+          it "serializes special char mixed content correctly with default encoding: UTF-8" do
+            parsed = MixedContentSpec::HexCode.from_xml(xml)
+            serialized = parsed.to_xml
+
+            expect(serialized.strip).to include(expected_default_encoding_xml)
+          end
+        end
+
+        context "when encoding: nil xml" do
+          let(:expected_encoding_nil_nokogiri_xml) { "&#x2211;computer security&#x220F; type of &#x200B; operation specified &#xB5; by an access right" }
+          let(:expected_encoding_nil_ox_xml) { "\xE2\x88\x91computer security\xE2\x88\x8F type of \xE2\x80\x8B operation specified \xC2\xB5 by an access right" }
+
+          it "serializes special char mixed content correctly with encoding: nil to get hexcode" do
+            parsed = MixedContentSpec::HexCode.from_xml(xml)
+            serialized = parsed.to_xml(encoding: nil)
+
+            if adapter_class == Lutaml::Model::XmlAdapter::OxAdapter
+              expected_output = expected_encoding_nil_ox_xml
+              expected_output.force_encoding("ASCII-8BIT")
+            else
+              expected_output = expected_encoding_nil_nokogiri_xml
+            end
+
+            expect(serialized.strip).to include(expected_output)
+          end
+        end
+      end
+    end
   end
 
   describe Lutaml::Model::XmlAdapter::NokogiriAdapter do
     it_behaves_like "mixed content behavior", described_class
+
+    it "raises error when serializes special char content with false encoding: 'ABC'" do
+      parsed = MixedContentSpec::HexCode.from_xml("<HexCode>&#x2211;computer security</HexCode>")
+
+      expect { parsed.to_xml(encoding: "ABC") }.to raise_error(StandardError, "unknown encoding name - ABC")
+    end
   end
 
   describe Lutaml::Model::XmlAdapter::OxAdapter do

data/spec/lutaml/model/serializable_validation_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 
 class TestSerializable < Lutaml::Model::Serializable
   attribute :name, :string, values: ["Alice", "Bob", "Charlie"]
+  attribute :email, :string, pattern: /.*?\S+@.+\.\S+/
   attribute :age, :integer, collection: 1..3
 
   xml do
@@ -27,9 +28,12 @@ class TestSerializable < Lutaml::Model::Serializable
 end
 
 RSpec.describe Lutaml::Model::Serializable do
-  let(:valid_instance) { TestSerializable.new(name: "Alice", age: [30]) }
+  let(:valid_instance) do
+    TestSerializable.new(name: "Alice", age: [30], email: "alice@gmail.com")
+  end
+
   let(:invalid_instance) do
-    TestSerializable.new(name: "David", age: [25, 30, 35, 40])
+    TestSerializable.new(name: "David", age: [25, 30, 35, 40], email: "david@gmail")
   end
 
   describe "serialization methods" do
@@ -66,8 +70,9 @@ RSpec.describe Lutaml::Model::Serializable do
     it "returns errors for invalid attributes" do
       errors = invalid_instance.validate
       expect(errors).not_to be_empty
-      expect(errors.first).to be_a(Lutaml::Model::InvalidValueError)
-      expect(errors.last).to be_a(Lutaml::Model::CollectionCountOutOfRangeError)
+      expect(errors[0]).to be_a(Lutaml::Model::InvalidValueError)
+      expect(errors[1]).to be_a(Lutaml::Model::PatternNotMatchedError)
+      expect(errors[2]).to be_a(Lutaml::Model::CollectionCountOutOfRangeError)
     end
   end
 

data/spec/lutaml/model/xml_mapping_spec.rb

@@ -127,6 +127,17 @@ module XmlMapping
     end
   end
 
+  class OverrideDefaultNamespacePrefix < Lutaml::Model::Serializable
+    attribute :same_element_name, SameNameDifferentNamespace
+
+    xml do
+      root "OverrideDefaultNamespacePrefix"
+      map_element :SameElementName, to: :same_element_name,
+                                    namespace: "http://www.omg.org/spec/XMI/20131001",
+                                    prefix: "abc"
+    end
+  end
+
   class SchemaLocationOrdered < Lutaml::Model::Serializable
     attribute :content, :string
     attribute :second, SchemaLocationOrdered
@@ -220,6 +231,30 @@ module XmlMapping
                                       prefix: nil
     end
   end
+
+  class Documentation < Lutaml::Model::Serializable
+    attribute :content, :string
+
+    xml do
+      root "documentation", mixed: true
+      namespace "http://www.w3.org/2001/XMLSchema", "xsd"
+
+      map_content to: :content
+    end
+  end
+
+  class Schema < Lutaml::Model::Serializable
+    attribute :documentation, Documentation, collection: true
+
+    xml do
+      root "schema"
+      namespace "http://www.w3.org/2001/XMLSchema", "xsd"
+
+      map_element :documentation, to: :documentation,
+                                  namespace: "http://www.w3.org/2001/XMLSchema",
+                                  prefix: "xsd"
+    end
+  end
 end
 
 RSpec.describe Lutaml::Model::XmlMapping do
@@ -245,6 +280,25 @@ RSpec.describe Lutaml::Model::XmlMapping do
     end
   end
 
+  context "overriding child namespace prefix" do
+    let(:input_xml) do
+      <<~XML
+        <OverrideDefaultNamespacePrefix xmlns:abc="http://www.omg.org/spec/XMI/20131001" xmlns:GML="http://www.sparxsystems.com/profiles/GML/1.0" xmlns:CityGML="http://www.sparxsystems.com/profiles/CityGML/1.0">
+          <abc:SameElementName App="hello">
+            <GML:ApplicationSchema>GML App</GML:ApplicationSchema>
+            <CityGML:ApplicationSchema>CityGML App</CityGML:ApplicationSchema>
+            <abc:ApplicationSchema>App</abc:ApplicationSchema>
+          </abc:SameElementName>
+        </OverrideDefaultNamespacePrefix>
+      XML
+    end
+
+    it "expect to round-trips" do
+      parsed = XmlMapping::OverrideDefaultNamespacePrefix.from_xml(input_xml)
+      expect(parsed.to_xml).to be_equivalent_to(input_xml)
+    end
+  end
+
   context "with same name elements" do
     let(:input_xml) do
       <<~XML
@@ -859,5 +913,19 @@ RSpec.describe Lutaml::Model::XmlMapping do
         expect(XmlMapping::SpecialCharContentWithMapAll.from_xml(xml).to_xml).to eq(expected_xml)
       end
     end
+
+    context "when mixed content is true and child is content_mapping" do
+      let(:xml) do
+        <<~XML
+          <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <xsd:documentation>asdf</xsd:documentation>
+          </xsd:schema>
+        XML
+      end
+
+      it "round-trips xml" do
+        expect(XmlMapping::Schema.from_xml(xml).to_xml).to be_equivalent_to(xml)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.3.27
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -59,6 +59,7 @@ files:
 - lib/lutaml/model/error/collection_count_out_of_range_error.rb
 - lib/lutaml/model/error/incorrect_mapping_argument_error.rb
 - lib/lutaml/model/error/invalid_value_error.rb
+- lib/lutaml/model/error/pattern_not_matched_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
@@ -127,6 +128,7 @@ files:
 - spec/fixtures/vase.rb
 - spec/fixtures/xml/special_char.xml
 - spec/lutaml/model/attribute_spec.rb
+- spec/lutaml/model/cdata_spec.rb
 - spec/lutaml/model/collection_spec.rb
 - spec/lutaml/model/comparable_model_spec.rb
 - spec/lutaml/model/custom_model_spec.rb