lutaml-model 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9883cb9431e9cd0c40c6e30891e1fb84861f1b9e9e7eb31a1cb5c6ec0d6121dc
-  data.tar.gz: 2d00bb121ca7486d151f4daaacb86f98824ef5950460dc4caecffe4280c93607
+  metadata.gz: 448150f0306f0357d896344e44f6f3cfe57fa301d4ad17d3479cead4dc6bcbfe
+  data.tar.gz: e86a83e06ea4b49b8d0a0cffb3235fb02c683bff4fdfa9e5ffebc3604b7cb1bf
 SHA512:
-  metadata.gz: df269be2c13bb4586e13d99dc79b47dbe1b445d49b8f23adf9c7ef502dae58deb77dd714431d29991c56e9aa9ac422a03910648e6f9a81414c7f375541fa6bf4
-  data.tar.gz: ed384722ad8f1fdb81671c8318ae0190c7372780a910ffece79e50658103344bd9f293afce048afa728cc91e47d952f6812bdbf2bce7a18d652d6704f9ef69cd
+  metadata.gz: 3e05c87251d2f2b73f6a0f27c87e24535c77e2fbf01d95375bfb0f107e78dab77deeb837010df3ea8f8bc9e98284e0b660381776d4d6ef686616d40f227d8cbf
+  data.tar.gz: 895641b33bf3ab077d95551c4879564b689333bc397e5ff4e820e73e96cae36ff3283e76b82c67406371898f9a36313d8ede2ed8b7675729a9dd3111f4079627

data/lib/lutaml/model/attribute.rb

@@ -248,13 +248,12 @@ module Lutaml
       end
 
       def cast(value, format, options = {})
-        value ||= [] if collection?
+        return value if type <= Serialize && value.is_a?(type.model)
 
+        value ||= [] if collection?
         if value.is_a?(Array)
-          value.map do |v|
-            cast(v, format, options)
-          end
-        elsif type <= Serialize && value.is_a?(Hash)
+          value.map { |v| cast(v, format, options) }
+        elsif type <= Serialize && (value.is_a?(Hash) || value.is_a?(Lutaml::Model::XmlAdapter::XmlElement))
           type.apply_mappings(value, format, options)
         elsif !value.nil? && !value.is_a?(type)
           type.send(:"from_#{format}", value)

data/lib/lutaml/model/serialize.rb

@@ -493,8 +493,9 @@ module Lutaml
 
           raise Lutaml::Model::CollectionTrueMissingError(self, option[:caller_class]) if doc.is_a?(Array)
 
+          doc_order = doc.root.order
           if instance.respond_to?(:ordered=)
-            instance.element_order = doc.root.order
+            instance.element_order = doc_order
             instance.ordered = mappings_for(:xml).ordered? || options[:ordered]
             instance.mixed = mappings_for(:xml).mixed_content? || options[:mixed_content]
           end
@@ -512,7 +513,7 @@ module Lutaml
           end
 
           defaults_used = []
-          validate_sequence!(instance.element_order)
+          validate_sequence!(doc_order)
 
           mappings.each do |rule|
             raise "Attribute '#{rule.to}' not found in #{self}" unless valid_rule?(rule)
@@ -534,9 +535,7 @@ module Lutaml
             rule.deserialize(instance, value, attributes, self)
           end
 
-          defaults_used.each do |attribute_name|
-            instance.using_default_for(attribute_name)
-          end
+          defaults_used.each { |attr_name| instance.using_default_for(attr_name) }
 
           instance
         end
@@ -548,9 +547,8 @@ module Lutaml
             doc.root.find_attribute_value(rule_names)
           else
             attr = attribute_for_rule(rule)
-
             children = doc.children.select do |child|
-              rule_names.include?(child.namespaced_name)
+              rule_names.include?(child.namespaced_name) && !child.text?
             end
 
             if rule.using_custom_methods? || attr.type == Lutaml::Model::Type::Hash
@@ -570,7 +568,7 @@ module Lutaml
 
             values = children.map do |child|
               if !rule.using_custom_methods? && attr.type <= Serialize
-                attr.type.apply_xml_mapping(child, attr.type.new, options.except(:mappings))
+                attr.cast(child, :xml, options.except(:mappings))
               elsif attr.raw?
                 inner_xml_of(child)
               else

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/spec/lutaml/model/custom_model_spec.rb

@@ -5,13 +5,53 @@ class CustomModelChild
 end
 
 class CustomModelParent
-  attr_accessor :first_name, :middle_name, :last_name, :child_mapper
+  attr_accessor :first_name, :middle_name, :last_name, :child_mapper, :math
 
   def name
     "#{first_name} #{last_name}"
   end
 end
 
+class GenericFormulaClass
+  attr_accessor :value
+end
+
+class Mi < Lutaml::Model::Serializable
+  model GenericFormulaClass
+
+  attribute :value, :string
+
+  xml do
+    root "mi"
+
+    map_content to: :value
+  end
+end
+
+class Mstyle < Lutaml::Model::Serializable
+  model GenericFormulaClass
+
+  attribute :value, Mi, collection: true
+
+  xml do
+    root "mstyle"
+
+    map_element :mi, to: :value
+  end
+end
+
+class MmlMath < Lutaml::Model::Serializable
+  model GenericFormulaClass
+
+  attribute :value, Mstyle, collection: true
+
+  xml do
+    root "math"
+
+    map_element :mstyle, to: :value
+  end
+end
+
 class CustomModelChildMapper < Lutaml::Model::Serializable
   model CustomModelChild
 
@@ -31,6 +71,7 @@ class CustomModelParentMapper < Lutaml::Model::Serializable
   attribute :middle_name, Lutaml::Model::Type::String
   attribute :last_name, Lutaml::Model::Type::String
   attribute :child_mapper, CustomModelChildMapper
+  attribute :math, MmlMath
 
   xml do
     map_element :first_name, to: :first_name
@@ -38,6 +79,7 @@ class CustomModelParentMapper < Lutaml::Model::Serializable
     map_element :last_name, to: :last_name
     map_element :CustomModelChild,
                 with: { to: :child_to_xml, from: :child_from_xml }
+    map_element :math, to: :math
   end
 
   def child_to_xml(model, parent, doc)
@@ -317,6 +359,11 @@ RSpec.describe "CustomModel" do
             <street>Oxford Street</street>
             <city>London</city>
           </CustomModelChild>
+          <math>
+            <mstyle>
+              <mi>Math</mi>
+            </mstyle>
+          </math>
         </CustomModelParent>
       XML
     end
@@ -333,6 +380,7 @@ RSpec.describe "CustomModel" do
         expect(instance.child_mapper.class).to eq(child_model)
         expect(instance.child_mapper.street).to eq("Oxford Street")
         expect(instance.child_mapper.city).to eq("London")
+        expect(instance.math.value.first.value.first.value).to eq("Math")
       end
     end
 

data/spec/lutaml/model/xml_mapping_spec.rb

@@ -57,6 +57,7 @@ module XmlMapping
   class Address < Lutaml::Model::Serializable
     attribute :street, ::Lutaml::Model::Type::String, raw: true
     attribute :city, :string, raw: true
+    attribute :text, :string
     attribute :address, Address
 
     xml do
@@ -64,6 +65,7 @@ module XmlMapping
 
       map_element "street", to: :street
       map_element "city", to: :city
+      map_element "text", to: :text
     end
   end
 
@@ -838,6 +840,7 @@ RSpec.describe Lutaml::Model::XmlMapping do
                 <p>adf</p>
               </street>
               <city><a>M</a></city>
+              <text>Building near ABC</text>
             </address>
           </person>
         XML
@@ -859,6 +862,27 @@ RSpec.describe Lutaml::Model::XmlMapping do
       end
     end
 
+    context "with element named `text`" do
+      let(:input_xml) do
+        <<~XML
+          <address>
+            <street>
+              <a>N</a>
+              <p>adf</p>
+            </street>
+            <city><a>M</a></city>
+            <text>Building near ABC</text>
+          </address>
+        XML
+      end
+
+      let(:model) { XmlMapping::Address.from_xml(input_xml) }
+
+      it "expect to contain raw xml" do
+        expect(model.text).to eq("Building near ABC")
+      end
+    end
+
     context "with content mapping" do
       let(:xml_data) { "<i>my text <b>bold</b> is in italics</i>" }
       let(:italic) { Italic.from_xml(xml_data) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64