lutaml-model 0.3.21 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f32654b195dc5ec1ea1d1969a8bd72e4f67b58c6995d4a18bcbea305422cf051
-  data.tar.gz: d1ee4d99a0a98e420ba4b779bfae6e8ceab2c908c508938aa3def80e04507169
+  metadata.gz: e7e401ce23a01b4dc80f709b71326b598cb9b9024b81d2a94f501bebf8112a14
+  data.tar.gz: 30534172ee835a9170e4335029702ec87ec4225c52e9e09566cb694fbd9c258d
 SHA512:
-  metadata.gz: ea73bd1071eeddac4a64dfd10b87f09cd2a357d3c841ca7169fc17edf629e8bfb1df0faa21ec2a080537022eab8a702f667cc1d0891175bb3e6181c0653a11ac
-  data.tar.gz: 7d1f186d1a51faac0abce30525e4fdc815e9c8ac7b7f8c4387a5caaa8a4db7cfea972ad18f61d3b87a4fa1cc1613ef84de2644e1e6502c8e8890a38b7a125f72
+  metadata.gz: ce9d2be7aac031cba94181053fa59f19cb61ed6fafbdda177bec369a03fd92d53dcfc9caf43a34ebb439c7d69d2bf3f0db1a56a49e5cc34021a8fe4a0fc7fe25
+  data.tar.gz: 187168f579188ad1458013375fd5bacb6718dbb29d77994229c1c11fb14bcec5df8bae8bcfbe42dc3e57a5918c663741df7168338a2df36869562613aa06d149

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-10-30 07:34:33 UTC using RuboCop version 1.66.1.
+# on 2024-11-03 22:29:56 UTC using RuboCop version 1.66.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 146
+# Offense count: 124
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
@@ -46,7 +46,7 @@ Metrics/AbcSize:
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
     - 'lib/lutaml/model/xml_mapping_rule.rb'
 
-# Offense count: 5
+# Offense count: 6
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
@@ -67,7 +67,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 51
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 43
+  Max: 46
 
 # Offense count: 7
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
@@ -95,7 +95,7 @@ RSpec/ContextWording:
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_mapping_spec.rb'
 
-# Offense count: 109
+# Offense count: 110
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 54

data/README.adoc

@@ -157,22 +157,27 @@ Syntax:
 attribute :name_of_attribute, {symbol | string | class}
 ----
 
+.Mapping between Lutaml::Model::Type classes, Ruby equivalents and serialization format types
 |===
-| String | Symbol | Class name | Actual value class
-
-| `String` | `:string` | `Lutaml::Model::Type::String` | `::String`
-| `Integer` | `:integer` | `Lutaml::Model::Type::Integer` | `::Integer`
-| `Float` | `:float` | `Lutaml::Model::Type::Float` | `::Float`
-| `Date` | `:date` | `Lutaml::Model::Type::Date` | `::Date`
-| `Time` | `:time` | `Lutaml::Model::Type::Time` | `::Time`
-| `DateTime` | `:date_time` | `Lutaml::Model::Type::DateTime` | `::DateTime`
-| `TimeWithoutDate` | `:time_without_date` | `Lutaml::Model::Type::TimeWithoutDate` | `::Time`
-| `Boolean` | `:boolean` | `Lutaml::Model::Type::Boolean` | `Boolean`
-| `Decimal` (optional) | `:decimal` | `Lutaml::Model::Type::Decimal` | `::BigDecimal`
-| `Hash` | `:hash` | `Lutaml::Model::Type::Hash` | `::Hash`
+| Lutaml::Model::Type   | Ruby Class               | XML               | JSON               | YAML        | Example Value
+
+| `:string`             | `String`                 | `xs:string`       | `string`           | `string`    | `"text"`
+| `:integer`            | `Integer`                | `xs:integer`      | `number`           | `integer`   | `42`
+| `:float`              | `Float`                  | `xs:decimal`      | `number`           | `float`     | `3.14`
+| `:boolean`            | `TrueClass`/`FalseClass` | `xs:boolean`      | `boolean`          | `boolean`   | `true/false`
+| `:date`               | `Date`                   | `xs:date`         | `string` (ISO8601) | `date`      | `"2024-01-01"`
+| `:time_without_date`  | `Time`                   | `xs:time`         | `string` (ISO8601) | `time`      | `"12:34:56"`
+| `:date_time`          | `DateTime`               | `xs:dateTime`     | `string` (ISO8601) | `timestamp` | `"2024-01-01T00:00:00Z"`
+| `:time`               | `Time`                   | `xs:dateTime`     | `string` (ISO8601) | `timestamp` | `"2024-01-01T00:00:00Z"`
+| `:decimal` (optional) | `BigDecimal`             | `xs:decimal`      | `number`           | `float`     | `123.45`
+| `:hash`               | `Hash`                   | complex element   | `object`           | `map`       | `{key: "value"}`
+| `class`               | Custom Class             | complex element   | `object`           | `map`       | `CustomObject`
+| `collection: true`    | `Array` of Type          | repeated elements | `array`            | `sequence`  | `[obj1, obj2]`
+// | `any`
 
 |===
 
+
 .Defining attributes with supported types via symbol, string and class
 [example]
 ====
@@ -538,8 +543,7 @@ For the following xml
     @description="\n    A <b>fictional person</b> commonly used as a <i>placeholder name</i>.\n  ",
     @element_order=["text", "name", "text", "description", "text"],
     @name="John Doe",
-    @ordered=nil,
-    @validate_on_set=false>
+    @ordered=nil>
 ----
 ====
 
@@ -1774,8 +1778,7 @@ end
    @name="Masterpiece: Vase",
    @ordered=nil,
    @size=12,
-   @description="A beautiful ceramic vase",
-   @validate_on_set=false>
+   @description="A beautiful ceramic vase">
 > puts CustomCeramic.new(name: "Vase", size: 12, description: "A beautiful vase").to_xml
 # <CustomCeramic Size="15">
 #   <Name>XML Masterpiece: Vase</Name>

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)
@@ -217,7 +216,8 @@ module Lutaml
 
       def validate_options!(options)
         if (invalid_opts = options.keys - ALLOWED_OPTIONS).any?
-          raise StandardError, "Invalid options given for `#{name}` #{invalid_opts}"
+          raise StandardError,
+                "Invalid options given for `#{name}` #{invalid_opts}"
         end
       end
 
@@ -225,7 +225,8 @@ module Lutaml
         return true if type.is_a?(Class)
         return true if [Symbol, String].include?(type.class) && cast_type!(type)
 
-        raise ArgumentError, "Invalid type: #{type}, must be a Symbol, String or a Class"
+        raise ArgumentError,
+              "Invalid type: #{type}, must be a Symbol, String or a Class"
       end
     end
   end

data/lib/lutaml/model/serialize.rb

@@ -32,9 +32,10 @@ module Lutaml
           @mappings ||= {}
           @attributes ||= {}
 
-          subclass.instance_variable_set(:@attributes, Utils.deep_dup(@attributes))
+          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)
@@ -51,17 +52,20 @@ module Lutaml
           Utils.add_boolean_accessor_if_not_defined(klass, :mixed)
           Utils.add_accessor_if_not_defined(klass, :element_order)
 
-          Utils.add_method_if_not_defined(klass, :using_default_for) do |attribute_name|
+          Utils.add_method_if_not_defined(klass,
+                                          :using_default_for) do |attribute_name|
             @using_default ||= {}
             @using_default[attribute_name] = true
           end
 
-          Utils.add_method_if_not_defined(klass, :value_set_for) do |attribute_name|
+          Utils.add_method_if_not_defined(klass,
+                                          :value_set_for) do |attribute_name|
             @using_default ||= {}
             @using_default[attribute_name] = false
           end
 
-          Utils.add_method_if_not_defined(klass, :using_default?) do |attribute_name|
+          Utils.add_method_if_not_defined(klass,
+                                          :using_default?) do |attribute_name|
             @using_default ||= {}
             !!@using_default[attribute_name]
           end
@@ -306,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)
@@ -336,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
 
@@ -384,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)
@@ -401,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
 
@@ -446,8 +451,7 @@ module Lutaml
       attr_writer :ordered, :mixed
 
       def initialize(attrs = {})
-        @validate_on_set = attrs.delete(:validate_on_set) || false
-        @using_default ||= {}
+        @using_default = {}
 
         return unless self.class.attributes
 

data/lib/lutaml/model/version.rb

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

data/lib/lutaml/model/xml_adapter/builder/nokogiri.rb

@@ -64,7 +64,7 @@ module Lutaml
           end
 
           def method_missing(method_name, *args, &block)
-            if block_given?
+            if block
               xml.public_send(method_name, *args, &block)
             else
               xml.public_send(method_name, *args)

data/lib/lutaml/model/xml_adapter/nokogiri_adapter.rb

@@ -128,12 +128,15 @@ module Lutaml
             )
           end
 
-          default_namespace = node.namespace&.href if root_node.nil?
+          if root_node.nil? && !node.namespace&.prefix
+            default_namespace = node.namespace&.href
+          end
 
           super(
             node,
             attributes,
-            parse_all_children(node, root_node: root_node || self, default_namespace: default_namespace),
+            parse_all_children(node, root_node: root_node || self,
+                                     default_namespace: default_namespace),
             node.text,
             parent_document: root_node,
             namespace_prefix: node.namespace&.prefix,
@@ -182,7 +185,8 @@ module Lutaml
 
         def parse_all_children(node, root_node: nil, default_namespace: nil)
           node.children.map do |child|
-            NokogiriElement.new(child, root_node: root_node, default_namespace: default_namespace)
+            NokogiriElement.new(child, root_node: root_node,
+                                       default_namespace: default_namespace)
           end
         end
 

data/lib/lutaml/model/xml_adapter/xml_document.rb

@@ -77,7 +77,10 @@ module Lutaml
           result.item_order = element.order
 
           element.children.each_with_object(result) do |child, hash|
-            attr = klass.attribute_for_child(child.name, format) if klass&.<= Serialize
+            if klass&.<= Serialize
+              attr = klass.attribute_for_child(child.name,
+                                               format)
+            end
 
             value = if child.text?
                       child.text
@@ -136,7 +139,8 @@ module Lutaml
           rule = options[:rule]
 
           if rule.custom_methods[:to]
-            options[:mapper_class].new.send(rule.custom_methods[:to], element, xml.parent, xml)
+            options[:mapper_class].new.send(rule.custom_methods[:to], element,
+                                            xml.parent, xml)
             return
           end
 
@@ -203,7 +207,8 @@ module Lutaml
             end
 
             xml_mapping.attributes.each do |attribute_rule|
-              attribute_rule.serialize_attribute(element, prefixed_xml.parent, xml)
+              attribute_rule.serialize_attribute(element, prefixed_xml.parent,
+                                                 xml)
             end
 
             xml_mapping.elements.each do |element_rule|
@@ -223,11 +228,13 @@ module Lutaml
                 element,
                 element_rule.prefix,
                 value,
-                options.merge({ attribute: attribute_def, rule: element_rule, mapper_class: mapper_class }),
+                options.merge({ attribute: attribute_def, rule: element_rule,
+                                mapper_class: mapper_class }),
               )
             end
 
-            process_content_mapping(element, xml_mapping.content_mapping, prefixed_xml)
+            process_content_mapping(element, xml_mapping.content_mapping,
+                                    prefixed_xml)
 
             process_raw_mapping(element, xml_mapping.raw_mapping, prefixed_xml)
           end
@@ -318,7 +325,8 @@ module Lutaml
             next unless type
 
             if type <= Lutaml::Model::Serialize
-              attrs = attrs.merge(build_namespace_attributes(type, processed, { caller_rule: mapping_rule }))
+              attrs = attrs.merge(build_namespace_attributes(type, processed,
+                                                             { caller_rule: mapping_rule }))
             end
 
             if mapping_rule.namespace && mapping_rule.prefix && mapping_rule.name != "lang"
@@ -348,8 +356,10 @@ module Lutaml
               hash["xmlns:#{mapping_rule.prefix}"] = mapping_rule.namespace
             end
 
-            if render_element?(mapping_rule, element, mapping_rule.to_value_for(element))
-              hash[mapping_rule.prefixed_name] = mapping_rule.to_value_for(element)
+            if render_element?(mapping_rule, element,
+                               mapping_rule.to_value_for(element))
+              hash[mapping_rule.prefixed_name] =
+                mapping_rule.to_value_for(element)
             end
           end
 

data/lib/lutaml/model/xml_mapping.rb

@@ -222,12 +222,15 @@ module Lutaml
 
       def deep_dup
         self.class.new.tap do |xml_mapping|
-          xml_mapping.root(@root_element.dup, mixed: @mixed_content, ordered: @ordered)
+          xml_mapping.root(@root_element.dup, mixed: @mixed_content,
+                                              ordered: @ordered)
           xml_mapping.namespace(@namespace_uri.dup, @namespace_prefix.dup)
 
-          xml_mapping.instance_variable_set(:@attributes, dup_mappings(@attributes))
+          xml_mapping.instance_variable_set(:@attributes,
+                                            dup_mappings(@attributes))
           xml_mapping.instance_variable_set(:@elements, dup_mappings(@elements))
-          xml_mapping.instance_variable_set(:@content_mapping, @content_mapping&.deep_dup)
+          xml_mapping.instance_variable_set(:@content_mapping,
+                                            @content_mapping&.deep_dup)
         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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.3.23
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
+date: 2024-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor