lutaml-model 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5097f4bf4d2b95fe089f40da159330218a69558acc9e3401784f12fc566bae00
-  data.tar.gz: 45a29395158a5362446677cfa7340b2e739a715ef7639c934f9a93a3e2b166cb
+  metadata.gz: da09d917512e0b5f82b847627920cb874b9bf4506ef568d95b45dd26aefef054
+  data.tar.gz: c31a188213089b94d752ba6e679ba8ac80f33c9f8e4f36f5bffddebf949b4a10
 SHA512:
-  metadata.gz: 7bccace8ffeabe88a60b06e610e0b168772981d4a2b6db956f9b70f295f5522c909e0f0001fed6396fdbd44169d9a191b6b5de2d94cf6a2135bbd6a226dd7669
-  data.tar.gz: 19ab03f407b11348eaf01f37db05151e82de56c0c9bcac1fb2e76f27597b7eea450e6d600216be5260ac04ccbe3111a858409a7a9ed33dc559397a6b885ad8fe
+  metadata.gz: 4b3f701841e4ac8d6b76f1afb7cccf1e2476200e9842ab1c5f3c664b4ec064f79831886963b0b7436ea16a8944158d7d50abe7a1e29b786e08486ad0fb2a0e10
+  data.tar.gz: c2c4ddb8166ccde0274acc9f38ba36a2058de7b3fc61c88ab82cc8f29cbc046d43e6844da874367720d59b4c35553a9cb5adccbfd17429a1be52a8f623f96992

data/.github/workflows/dependent-repos.json

@@ -11,6 +11,7 @@
     "glossarist/glossarist-ruby",
     "lutaml/oasis-etm",
     "lutaml/ali",
-    "lutaml/reqif"
+    "lutaml/reqif",
+    "lutaml/lutaml-xsd"
   ]
 }

data/lib/lutaml/model/serialize.rb

@@ -563,7 +563,8 @@ module Lutaml
             end
 
             if rule.using_custom_methods? || attr.type == Lutaml::Model::Type::Hash
-              return children.first
+              return_child = attr.type == Lutaml::Model::Type::Hash || !attr.collection? if attr
+              return return_child ? children.first : children
             end
 
             if Utils.present?(children)

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.6.6"
+    VERSION = "0.6.7"
   end
 end

data/spec/lutaml/model/cdata_spec.rb

@@ -43,8 +43,8 @@ module CDATA
       map_element "address", to: :address
     end
 
-    def house_from_xml(model, node)
-      model.house = node.children.first.text
+    def house_from_xml(model, nodes)
+      model.house = nodes.first.children.first.text
     end
 
     def house_to_xml(model, _parent, doc)
@@ -53,8 +53,8 @@ module CDATA
       end
     end
 
-    def city_from_xml(model, node)
-      model.city = node.children.first.text
+    def city_from_xml(model, nodes)
+      model.city = nodes.first.children.first.text
     end
 
     def city_to_xml(model, _parent, doc)
@@ -117,8 +117,8 @@ module CDATA
 
     def child_from_xml(model, value)
       model.child_mapper ||= CustomModelChild.new
-      model.child_mapper.street = value.find_child_by_name("street").text
-      model.child_mapper.city = value.find_child_by_name("city").text
+      model.child_mapper.street = value.first.find_child_by_name("street").text
+      model.child_mapper.city = value.first.find_child_by_name("city").text
     end
   end
 

data/spec/lutaml/model/collection_spec.rb

@@ -46,8 +46,8 @@ module CollectionTests
       map_element "address", to: :address
     end
 
-    def city_from_xml(model, node)
-      model.city = node.text
+    def city_from_xml(model, nodes)
+      model.city = nodes.first.text
     end
 
     def city_to_xml(model, parent, doc)

data/spec/lutaml/model/custom_model_spec.rb

@@ -95,10 +95,10 @@ class CustomModelParentMapper < Lutaml::Model::Serializable
     doc.add_element(parent, child_el)
   end
 
-  def child_from_xml(model, value)
+  def child_from_xml(model, values)
     model.child_mapper ||= CustomModelChild.new
-    model.child_mapper.street = value.find_child_by_name("street").text
-    model.child_mapper.city = value.find_child_by_name("city").text
+    model.child_mapper.street = values.first.find_child_by_name("street").text
+    model.child_mapper.city = values.first.find_child_by_name("city").text
   end
 end
 

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/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

metadata

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