lutaml-model 0.3.22 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d740eaaa52ff7479fc3e0f23aa3fb308bd8b61f820ac22f036b31f24d696989
-  data.tar.gz: '0294c66616f39e84e931b626f776ee555450ac962018bf3189200467761e2707'
+  metadata.gz: e7e401ce23a01b4dc80f709b71326b598cb9b9024b81d2a94f501bebf8112a14
+  data.tar.gz: 30534172ee835a9170e4335029702ec87ec4225c52e9e09566cb694fbd9c258d
 SHA512:
-  metadata.gz: 56675b27dfbf1fa77986f5793f48dd8f5b53b69d5fa989209f79c1f2827ee0ed46eeeeecaed72904be2053a12c4653dab5d06dd0b1401754a06e9a0a9db8fc0f
-  data.tar.gz: cedbee96c00a6d43065df43acc8ee7d5262bd03265fda81fc85698c1abb7c00f0989c7cc9d1afe1f5038b4323e886adadd0609250dd9f952e2e1b33fcc9b7fee
+  metadata.gz: ce9d2be7aac031cba94181053fa59f19cb61ed6fafbdda177bec369a03fd92d53dcfc9caf43a34ebb439c7d69d2bf3f0db1a56a49e5cc34021a8fe4a0fc7fe25
+  data.tar.gz: 187168f579188ad1458013375fd5bacb6718dbb29d77994229c1c11fb14bcec5df8bae8bcfbe42dc3e57a5918c663741df7168338a2df36869562613aa06d149

data/lib/lutaml/model/attribute.rb

@@ -200,11 +200,10 @@ module Lutaml
 
       def cast(value, format, options = {})
         value ||= [] if collection?
-        instance = options[:instance]
 
         if value.is_a?(Array)
           value.map do |v|
-            cast(v, format, instance: instance)
+            cast(v, format, options)
           end
         elsif type <= Serialize && value.is_a?(Hash)
           type.apply_mappings(value, format, options)

data/lib/lutaml/model/serialize.rb

@@ -35,7 +35,7 @@ module Lutaml
           subclass.instance_variable_set(:@attributes,
                                          Utils.deep_dup(@attributes))
           subclass.instance_variable_set(:@mappings, Utils.deep_dup(@mappings))
-          subclass.instance_variable_set(:@model, subclass)
+          subclass.instance_variable_set(:@model, @model || subclass)
         end
 
         def model(klass = nil)
@@ -310,6 +310,7 @@ module Lutaml
         def apply_xml_mapping(doc, instance, options = {})
           return instance unless doc
 
+          options[:default_namespace] = mappings_for(:xml)&.namespace_uri if options[:default_namespace].nil?
           mappings = mappings_for(:xml).mappings
 
           if doc.is_a?(Array)
@@ -340,14 +341,14 @@ module Lutaml
                       doc.node.inner_xml
                     elsif rule.content_mapping?
                       doc["text"]
-                    elsif doc.key_exist?(rule.namespaced_name)
-                      doc.fetch(rule.namespaced_name)
+                    elsif doc.key_exist?(rule.namespaced_name(options[:default_namespace]))
+                      doc.fetch(rule.namespaced_name(options[:default_namespace]))
                     else
                       defaults_used << rule.to
                       rule.to_value_for(instance)
                     end
 
-            value = normalize_xml_value(value, rule)
+            value = normalize_xml_value(value, rule, options)
             rule.deserialize(instance, value, attributes, self)
           end
 
@@ -388,7 +389,7 @@ module Lutaml
           instance
         end
 
-        def normalize_xml_value(value, rule)
+        def normalize_xml_value(value, rule, options = {})
           attr = attribute_for_rule(rule)
 
           value = [value].compact if attr&.collection? && !value.is_a?(Array)
@@ -405,11 +406,11 @@ module Lutaml
 
           return value unless cast_value?(attr, rule)
 
+          options.merge(caller_class: self, mixed_content: rule.mixed_content)
           attr.cast(
             value,
             :xml,
-            caller_class: self,
-            mixed_content: rule.mixed_content,
+            options,
           )
         end
 

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.3.22"
+    VERSION = "0.3.23"
   end
 end

data/lib/lutaml/model/xml_mapping_rule.rb

@@ -73,7 +73,7 @@ module Lutaml
         end
       end
 
-      def namespaced_name
+      def namespaced_name(parent_namespace = nil)
         if name == "lang"
           "#{prefix}:#{name}"
         elsif namespace_set? || @attribute
@@ -81,7 +81,7 @@ module Lutaml
         elsif default_namespace
           "#{default_namespace}:#{name}"
         else
-          name
+          [parent_namespace, name].compact.join(":")
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Ribose Inc.