lutaml-model 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8362f4af3671083805d20014ef7e2422358aac08f1c15036a283dbedb91225ca
-  data.tar.gz: 661838fcd61e972cd1827a1b4889b3d2073e7a8db16a4fce371dcbf09fb79b96
+  metadata.gz: 12f6b0d44c864c56f2573bae9a712485e0b266120fe53f342671b8cb144ce022
+  data.tar.gz: 3facbc5cc6ef8149f1628415f3d511c2e010de28f8ab5968f2e436eb6aa41b39
 SHA512:
-  metadata.gz: 31757feb85022ff8472b8e178ff433a84e2dcbd7a00b6cc2055f3f4d860b4470201c2ee6c39d2a2b96cc86d96ec3654affd7078bb2cad595345afa50fec9826d
-  data.tar.gz: ff6f2048f11d46a9e4df1ec872bca13e5ebcbbc098aa35689840e3601d18337e2e7a85afd48f8a67b1b39482782258cdc1494f13eb1cd67eac8ac37cc2f5809d
+  metadata.gz: 0157ca6aa7a9e0e0368fd1da623068670d033a54385b91aa45082412512f5ee1643d72da168d5b68fdef531034f49363417dbfce31c4b47452c8f1d0136d839d
+  data.tar.gz: cf6c69e91f9eb13275a845ee4253809cc60599527a26f28d13942fa26b10ce65bfbc6a6fed8fbc946a721a1d07edd8b98289447c668f7d8cba6dc3cd001bc85b

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-08-23 04:30:59 UTC using RuboCop version 1.65.1.
+# on 2024-09-04 07:55:32 UTC using RuboCop version 1.66.0.
 # 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
@@ -14,107 +14,14 @@ Gemspec/RequireMFA:
   Exclude:
     - 'lutaml-model.gemspec'
 
-# Offense count: 28
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'lib/lutaml/model/serialize.rb'
-    - 'lib/lutaml/model/xml_adapter/nokogiri_adapter.rb'
-    - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
-    - 'lib/lutaml/model/xml_adapter/xml_document.rb'
-    - 'spec/lutaml/model/serializable_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IndentationWidth.
-Layout/AssignmentIndentation:
-  Exclude:
-    - 'lib/lutaml/model/xml_adapter/nokogiri_adapter.rb'
-
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'lib/lutaml/model/xml_adapter/xml_document.rb'
-    - 'spec/lutaml/model/serializable_spec.rb'
-
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-Layout/BlockEndNewline:
-  Exclude:
-    - 'lib/lutaml/model/xml_adapter/xml_document.rb'
-    - 'spec/lutaml/model/serializable_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/lutaml/model/serialize.rb'
-
-# Offense count: 16
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'lib/lutaml/model/serialize.rb'
-    - 'lib/lutaml/model/xml_adapter/xml_document.rb'
-    - 'spec/lutaml/model/serializable_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: normal, indented_internal_methods
-Layout/IndentationConsistency:
-  Exclude:
-    - 'lutaml-model.gemspec'
-
-# Offense count: 12
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, AllowedPatterns.
-Layout/IndentationWidth:
-  Exclude:
-    - 'lib/lutaml/model/xml_adapter/xml_document.rb'
-    - 'spec/lutaml/model/serializable_spec.rb'
-
-# Offense count: 83
+# Offense count: 62
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Exclude:
-    - 'lib/lutaml/model/cli.rb'
-    - 'lib/lutaml/model/comparable_model.rb'
-    - 'lib/lutaml/model/serialize.rb'
-    - 'lib/lutaml/model/type.rb'
-    - 'lib/lutaml/model/utils.rb'
-    - 'lib/lutaml/model/xml_adapter/nokogiri_adapter.rb'
-    - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
-    - 'lib/lutaml/model/xml_adapter/xml_document.rb'
-    - 'spec/lutaml/model/comparable_model_spec.rb'
-    - 'spec/lutaml/model/custom_serialization_spec.rb'
-    - 'spec/lutaml/model/delegation_spec.rb'
-    - 'spec/lutaml/model/schema/json_schema_spec.rb'
-    - 'spec/lutaml/model/serializable_spec.rb'
-
-# Offense count: 24
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'lib/lutaml/model/serialize.rb'
-    - 'lib/lutaml/model/xml_adapter/nokogiri_adapter.rb'
-    - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
-    - 'lib/lutaml/model/xml_adapter/xml_document.rb'
-    - 'spec/lutaml/model/serializable_spec.rb'
+  Enabled: false
 
-# Offense count: 4
+# Offense count: 10
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
 Lint/ConstantDefinitionInBlock:
@@ -123,8 +30,9 @@ Lint/ConstantDefinitionInBlock:
     - 'spec/lutaml/model/schema/relaxng_schema_spec.rb'
     - 'spec/lutaml/model/schema/xsd_schema_spec.rb'
     - 'spec/lutaml/model/schema/yaml_schema_spec.rb'
+    - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
 
-# Offense count: 28
+# Offense count: 29
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -137,16 +45,17 @@ Metrics/AbcSize:
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
 
-# Offense count: 5
+# Offense count: 6
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 29
+  Max: 42
 
-# Offense count: 20
+# Offense count: 22
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
+    - 'lib/lutaml/model/attribute.rb'
     - 'lib/lutaml/model/comparable_model.rb'
     - 'lib/lutaml/model/serialize.rb'
     - 'lib/lutaml/model/type.rb'
@@ -154,27 +63,28 @@ Metrics/CyclomaticComplexity:
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
 
-# Offense count: 37
+# Offense count: 36
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 45
+  Max: 43
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 16
+# Offense count: 18
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
+    - 'lib/lutaml/model/attribute.rb'
     - 'lib/lutaml/model/comparable_model.rb'
     - 'lib/lutaml/model/serialize.rb'
     - 'lib/lutaml/model/xml_adapter/nokogiri_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
 
-# Offense count: 6
+# Offense count: 7
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -182,8 +92,9 @@ RSpec/ContextWording:
     - 'spec/lutaml/model/xml_adapter/nokogiri_adapter_spec.rb'
     - 'spec/lutaml/model/xml_adapter/oga_adapter_spec.rb'
     - 'spec/lutaml/model/xml_adapter/ox_adapter_spec.rb'
+    - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
 
-# Offense count: 76
+# Offense count: 86
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 57
@@ -194,13 +105,14 @@ RSpec/IndexedLet:
   Exclude:
     - 'spec/address_spec.rb'
 
-# Offense count: 12
+# Offense count: 18
 RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/lutaml/model/schema/json_schema_spec.rb'
     - 'spec/lutaml/model/schema/relaxng_schema_spec.rb'
     - 'spec/lutaml/model/schema/xsd_schema_spec.rb'
     - 'spec/lutaml/model/schema/yaml_schema_spec.rb'
+    - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
 
 # Offense count: 4
 RSpec/MultipleDescribes:
@@ -210,18 +122,19 @@ RSpec/MultipleDescribes:
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_adapter_spec.rb'
 
-# Offense count: 70
+# Offense count: 75
 RSpec/MultipleExpectations:
-  Max: 10
+  Max: 11
 
 # Offense count: 11
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 9
 
-# Offense count: 3
+# Offense count: 4
 RSpec/PendingWithoutReason:
   Exclude:
+    - 'spec/lutaml/model/mixed_content_spec.rb'
     - 'spec/lutaml/model/xml_adapter/oga_adapter_spec.rb'
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_adapter_spec.rb'
@@ -239,35 +152,9 @@ Security/CompoundHash:
   Exclude:
     - 'lib/lutaml/model/comparable_model.rb'
 
-# Offense count: 10
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# AllowedMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'lib/lutaml/model/xml_adapter/xml_document.rb'
-    - 'spec/lutaml/model/serializable_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/MultilineIfModifier:
-  Exclude:
-    - 'lib/lutaml/model/serialize.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/lutaml/model/comparable_model.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'lutaml-model.gemspec'

data/README.adoc

@@ -652,6 +652,7 @@ end
 
 ==== Namespaces
 
+[[root-namespace]]
 ===== Namespace at root
 
 The `namespace` method in the `xml` block sets the namespace for the root
@@ -659,6 +660,7 @@ element.
 
 Syntax:
 
+.Setting default namespace at the root element
 [source,ruby]
 ----
 xml do
@@ -666,6 +668,15 @@ xml do
 end
 ----
 
+.Setting a prefixed namespace at the root element
+[source,ruby]
+----
+xml do
+  namespace 'http://example.com/namespace', 'prefix'
+end
+----
+
+
 .Using the `namespace` method to set the namespace for the root element
 [example]
 ====
@@ -698,10 +709,43 @@ end
 ----
 ====
 
+.Using the `namespace` method to set a prefixed namespace for the root element
+[example]
+====
+[source,ruby]
+----
+class Ceramic < Lutaml::Model::Serializable
+  attribute :type, :string
+  attribute :glaze, :string
+
+  xml do
+    root 'Ceramic'
+    namespace 'http://example.com/ceramic', 'cer'
+    map_element 'Type', to: :type
+    map_element 'Glaze', to: :glaze
+  end
+end
+----
+
+[source,xml]
+----
+<cer:Ceramic xmlns='http://example.com/ceramic'><cer:Type>Porcelain</cer:Type><cer:Glaze>Clear</cer:Glaze></cer:Ceramic>
+----
+
+[source,ruby]
+----
+> Ceramic.from_xml(xml_file)
+> #<Ceramic:0x0000000104ac7240 @type="Porcelain", @glaze="Clear">
+> Ceramic.new(type: "Porcelain", glaze: "Clear").to_xml
+> #<cer:Ceramic xmlns="http://example.com/ceramic"><cer:Type>Porcelain</cer:Type><cer:Glaze>Clear</cer:Glaze></cer:Ceramic>
+----
+====
+
+
 ===== Namespace on attribute
 
-If the namespace is defined on an XML attribute, then that will be given
-priority over the one defined in the class.
+If the namespace is defined on a model attribute that already has a namespace,
+the mapped namespace will be given priority over the one defined in the class.
 
 Syntax:
 
@@ -725,6 +769,19 @@ In this example, `glz` will be used for `Glaze` if it is added inside the
 
 [source,ruby]
 ----
+class Ceramic < Lutaml::Model::Serializable
+  attribute :type, :string
+  attribute :glaze, Glaze
+
+  xml do
+    root 'Ceramic'
+    namespace 'http://example.com/ceramic'
+
+    map_element 'Type', to: :type
+    map_element 'Glaze', to: :glaze, namespace: 'http://example.com/glaze', prefix: "glz"
+  end
+end
+
 class Glaze < Lutaml::Model::Serializable
   attribute :color, :string
   attribute :temperature, :integer
@@ -737,18 +794,6 @@ class Glaze < Lutaml::Model::Serializable
     map_element 'temperature', to: :temperature
   end
 end
-
-class Ceramic < Lutaml::Model::Serializable
-  attribute :type, :string
-  attribute :glaze, Glaze
-
-  xml do
-    root 'Ceramic'
-    map_element 'Type', to: :type
-    map_element 'Glaze', to: :glaze, namespace: 'http://example.com/glaze', prefix: "glz"
-    map_attribute 'xmlns', to: :namespace, namespace: 'http://example.com/ceramic'
-  end
-end
 ----
 
 [source,xml]
@@ -764,6 +809,11 @@ end
 
 [source,ruby]
 ----
+> # Using the original Glaze class namespace
+> Glaze.new(color: "Clear", temperature: 1050).to_xml
+> #<glaze:Glaze xmlns="http://example.com/old_glaze"><color>Clear</color><temperature>1050</temperature></glaze:Glaze>
+
+> # Using the Ceramic class namespace for Glaze
 > Ceramic.from_xml(xml_file)
 > #<Ceramic:0x0000000104ac7240 @type="Porcelain", @glaze=#<Glaze:0x0000000104ac7240 @color="Clear", @temperature=1050>>
 > Ceramic.new(type: "Porcelain", glaze: Glaze.new(color: "Clear", temperature: 1050)).to_xml
@@ -800,7 +850,7 @@ class Ceramic < Lutaml::Model::Serializable
 
   xml do
     root 'Ceramic'
-    namespace 'http://example.com/ceramic', prefix: 'cera'
+    namespace 'http://example.com/ceramic', 'cera'
     map_element 'Type', to: :type, namespace: :inherit
     map_element 'Glaze', to: :glaze
     map_attribute 'color', to: :color, namespace: 'http://example.com/color', prefix: 'clr'
@@ -810,13 +860,13 @@ end
 
 [source,xml]
 ----
-<Ceramic
+<cera:Ceramic
   xmlns:cera='http://example.com/ceramic'
   xmlns:clr='http://example.com/color'
   clr:color="navy-blue">
   <cera:Type>Porcelain</cera:Type>
   <Glaze>Clear</Glaze>
-</Ceramic>
+</cera:Ceramic>
 ----
 
 [source,ruby]
@@ -824,20 +874,18 @@ end
 > Ceramic.from_xml(xml_file)
 > #<Ceramic:0x0000000104ac7240 @type="Porcelain", @glaze="Clear", @color="navy-blue">
 > Ceramic.new(type: "Porcelain", glaze: "Clear", color: "navy-blue").to_xml
-> #<Ceramic xmlns:cera="http://example.com/ceramic"
+> #<cera:Ceramic xmlns:cera="http://example.com/ceramic"
   # xmlns:clr='http://example.com/color'
   # clr:color="navy-blue">
   #  <cera:Type>Porcelain</cera:Type>
   #  <Glaze>Clear</Glaze>
-  # </Ceramic>
+  # </cera:Ceramic>
 ----
 ====
 
 [[mixed-content]]
 ==== Mixed content
 
-===== General
-
 In XML there can be tags that contain content mixed with other tags and where
 whitespace is significant, such as to represent rich text.
 
@@ -857,9 +905,8 @@ To map this to Lutaml::Model we can use the `mixed` option in either way:
 NOTE: This feature is not supported by Shale.
 
 
-===== Specifying the `mixed` option at `root`
-
-This will always treat the content of the element itself as mixed content.
+To specify mixed content, the `mixed: true` option needs to be set at the
+`xml` block's `root` method.
 
 Syntax:
 
@@ -876,7 +923,7 @@ end
 [source,ruby]
 ----
 class Paragraph < Lutaml::Model::Serializable
-  attribute :bold, :string
+  attribute :bold, :string, collection: true # allows multiple bold tags
   attribute :italic, :string
 
   xml do
@@ -900,57 +947,6 @@ end
 TODO: How to create mixed content from `#new`?
 
 
-===== Specifying the `mixed` option when referencing a model
-
-This will only treat the content of the referenced model as mixed content if the
-`mixed: true` is added when referencing it.
-
-Syntax:
-
-[source,ruby]
-----
-xml do
-  map_element 'xml_element_name', to: :name_of_attribute, mixed: true
-end
-----
-
-.Applying `mixed` to treat an inner element as mixed content
-[example]
-====
-[source,ruby]
-----
-class Paragraph < Lutaml::Model::Serializable
-  attribute :bold, :string
-  attribute :italic, :string
-
-  xml do
-    root 'p'
-
-    map_element 'bold', to: :bold
-    map_element 'i', to: :italic
-  end
-end
-
-class Description < Lutaml::Model::Serializable
-  attribute :paragraph, Paragraph
-
-  xml do
-    root 'description'
-
-    map_element 'p', to: :paragraph, mixed: true
-  end
-end
-----
-
-[source,ruby]
-----
-> Description.from_xml("<description><p>My name is <bold>John Doe</bold>, and I'm <i>28</i> years old</p></description>")
-> #<Description:0x0000000104ac7240 @paragraph=#<Paragraph:0x0000000104ac7240 @bold="John Doe", @italic="28">>
-> Description.new(paragraph: Paragraph.new(bold: "John Doe", italic: "28")).to_xml
-> #<description><p>My name is <bold>John Doe</bold>, and I'm <i>28</i> years old</p></description>
-----
-====
-
 
 === Key value data models
 
@@ -1579,7 +1575,7 @@ Lutaml::Model::Config.configure do |config|
 end
 ----
 
-You can also provide the adapter type by using symbols like 
+You can also provide the adapter type by using symbols like
 
 [source,ruby]
 ----
@@ -1765,6 +1761,11 @@ differences in implementation.
 
 4+h| XML features
 
+| <<root-namespace,XML default namespace>>
+| Yes. Supports `<root xmlns='http://example.com'>` through the `namespace` option without prefix.
+| No. Only supports `<root xmlns:prefix='http://example.com'>`.
+|
+
 | XML mixed content support
 | Yes. Supports the following kind of XML through <<mixed-content,mixed content>> support.
 

data/lib/lutaml/model/attribute.rb

@@ -61,7 +61,7 @@ module Lutaml
           value.map do |v|
             cast(v, format, instance: instance)
           end
-        elsif type <= Serialize
+        elsif type <= Serialize && value.is_a?(Hash)
           type.apply_mappings(value, format, options)
         else
           Lutaml::Model::Type.cast(value, type)

data/lib/lutaml/model/serialize.rb

@@ -84,27 +84,46 @@ module Lutaml
 
           define_method(:"from_#{format}") do |data|
             adapter = Lutaml::Model::Config.send(:"#{format}_adapter")
-            doc = adapter.parse(data)
 
-            apply_mappings(doc.to_h, format)
+            doc = adapter.parse(data)
+            public_send(:"of_#{format}", doc.to_h)
           end
 
-          define_method(:"to_#{format}") do |instance|
-            unless instance.is_a?(model)
-              msg = "argument is a '#{instance.class}' but should be a '#{model}'"
-              raise Lutaml::Model::IncorrectModelError, msg
+          define_method(:"of_#{format}") do |hash|
+            if hash.is_a?(Array)
+              return hash.map do |item|
+                apply_mappings(item, format)
+              end
             end
 
+            apply_mappings(hash, format)
+          end
+
+          define_method(:"to_#{format}") do |instance|
+            value = public_send(:"as_#{format}", instance)
             adapter = Lutaml::Model::Config.public_send(:"#{format}_adapter")
 
             if format == :xml
               xml_options = { mapper_class: self }
-
-              adapter.new(instance).public_send(:"to_#{format}", xml_options)
+              adapter.new(value).public_send(:"to_#{format}", xml_options)
             else
-              hash = hash_representation(instance, format)
-              adapter.new(hash).public_send(:"to_#{format}")
+              adapter.new(value).public_send(:"to_#{format}")
+            end
+          end
+
+          define_method(:"as_#{format}") do |instance|
+            if instance.is_a?(Array)
+              return instance.map { |item| public_send(:"as_#{format}", item) }
+            end
+
+            unless instance.is_a?(model)
+              msg = "argument is a '#{instance.class}' but should be a '#{model}'"
+              raise Lutaml::Model::IncorrectModelError, msg
             end
+
+            return instance if format == :xml
+
+            hash_representation(instance, format)
           end
         end
 
@@ -120,8 +139,7 @@ module Lutaml
             next handle_delegate(instance, rule, hash, format) if rule.delegate
 
             if rule.custom_methods[:to]
-              next instance.send(rule.custom_methods[:to], instance,
-                                 hash)
+              next instance.send(rule.custom_methods[:to], instance, hash)
             end
 
             value = instance.send(name)
@@ -238,6 +256,7 @@ module Lutaml
 
         def apply_mappings(doc, format, options = {})
           instance = options[:instance] || model.new
+          return instance if !doc || doc.empty?
           return apply_xml_mapping(doc, instance, options) if format == :xml
 
           mappings = mappings_for(format).mappings
@@ -257,7 +276,10 @@ module Lutaml
                     end
 
             if rule.custom_methods[:from]
-              value = new.send(rule.custom_methods[:from], instance, value)
+              if value && !value.empty?
+                value = new.send(rule.custom_methods[:from], instance,
+                                 value)
+              end
               next
             end
 
@@ -289,7 +311,7 @@ module Lutaml
                   "missing for #{self} in #{options[:caller_class]}"
           end
 
-          if instance.respond_to?(:ordered=)
+          if instance.respond_to?(:ordered=) && doc.is_a?(Lutaml::Model::MappingHash)
             instance.element_order = doc.item_order
             instance.ordered = mappings_for(:xml).mixed_content? || options[:mixed_content]
           end
@@ -299,12 +321,15 @@ module Lutaml
             raise "Attribute '#{rule.to}' not found in #{self}" unless attr
 
             is_content_mapping = rule.name.nil?
+
             value = if is_content_mapping
                       doc["text"]
                     else
                       doc[rule.name.to_s] || doc[rule.name.to_sym]
                     end
 
+            value = [value].compact if attr.collection? && !value.is_a?(Array)
+
             if value.is_a?(Array)
               value = value.map do |v|
                 v.is_a?(Hash) && !(attr.type <= Serialize) ? v["text"] : v

data/lib/lutaml/model/type.rb

@@ -22,11 +22,13 @@ module Lutaml
                      class #{t}                        # class Integer
             def self.cast(value)            #   def self.cast(value)
               return if value.nil?          #     return if value.nil?
+                                            #
               Type.cast(value, #{t})        #     Type.cast(value, Integer)
             end                             #   end
 
             def self.serialize(value)       #   def self.serialize(value)
               return if value.nil?          #     return if value.nil?
+                                            #
               Type.serialize(value, #{t})   #     Type.serialize(value, Integer)
             end                             #   end
           end                               # end

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.3.7"
+    VERSION = "0.3.9"
   end
 end

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

@@ -17,9 +17,14 @@ module Lutaml
 
           def initialize(xml)
             @xml = xml
+            @current_namespace = nil
           end
 
           def create_element(name, attributes = {})
+            if @current_namespace && !name.start_with?("#{@current_namespace}:")
+              name = "#{@current_namespace}:#{name}"
+            end
+
             if block_given?
               xml.element(name, attributes) do |element|
                 yield(self.class.new(element))
@@ -36,6 +41,8 @@ module Lutaml
           def create_and_add_element(element_name, prefix: nil, attributes: {})
             prefixed_name = if prefix
                               "#{prefix}:#{element_name}"
+                            elsif @current_namespace && !element_name.start_with?("#{@current_namespace}:")
+                              "#{@current_namespace}:#{element_name}"
                             else
                               element_name
                             end
@@ -47,6 +54,8 @@ module Lutaml
             else
               xml.element(prefixed_name, attributes)
             end
+
+            @current_namespace = nil
           end
 
           def <<(text)
@@ -59,9 +68,10 @@ module Lutaml
 
           # Add XML namespace to document
           #
-          # Ox doesn't support XML namespaces so this method does nothing.
-          def add_namespace_prefix(_prefix)
-            # :noop:
+          # Ox doesn't support XML namespaces so we only save the
+          # current namespace prefix to add it to the element's name later.
+          def add_namespace_prefix(prefix)
+            @current_namespace = prefix
             self
           end
 

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

@@ -72,17 +72,18 @@ module Lutaml
                 text = text[curr_index] if text.is_a?(Array)
 
                 prefixed_xml.text text
-              elsif attribute_def.collection?
+              elsif !value.nil? || element_rule.render_nil?
+                value = value[curr_index] if attribute_def.collection?
+
                 add_to_xml(
                   xml,
                   element_rule.prefix,
-                  value[curr_index],
-                  attribute_def,
-                  element_rule,
+                  value,
+                  options.merge(
+                    attribute: attribute_def,
+                    rule: element_rule,
+                  ),
                 )
-              elsif !value.nil? || element_rule.render_nil?
-                add_to_xml(xml, element_rule.prefix, value, attribute_def,
-                           element_rule)
               end
             end
           end
@@ -158,7 +159,7 @@ module Lutaml
           end
         end
 
-        def build_attributes(node)
+        def build_attributes(node, _options = {})
           attrs = node.attributes.transform_values(&:value)
 
           attrs.merge(build_namespace_attributes(node))

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

@@ -20,6 +20,8 @@ module Lutaml
           elsif ordered?(@root, options)
             build_ordered_element(builder, @root, options)
           else
+            mapper_class = options[:mapper_class] || @root.class
+            options[:xml_attributes] = build_namespace_attributes(mapper_class)
             build_element(builder, @root, options)
           end
 
@@ -46,6 +48,7 @@ module Lutaml
               curr_index = index_hash[name] += 1
 
               element_rule = xml_mapping.find_by_name(name)
+              next if element_rule.nil?
 
               attribute_def = attribute_definition_for(element, element_rule,
                                                        mapper_class: mapper_class)
@@ -56,11 +59,18 @@ module Lutaml
                 text = text[curr_index] if text.is_a?(Array)
 
                 el.add_text(el, text)
-              elsif attribute_def.collection?
-                add_to_xml(el, nil, value[curr_index], attribute_def,
-                           element_rule)
               elsif !value.nil? || element_rule.render_nil?
-                add_to_xml(el, nil, value, attribute_def, element_rule)
+                value = value[curr_index] if attribute_def.collection?
+
+                add_to_xml(
+                  el,
+                  nil,
+                  value,
+                  options.merge(
+                    attribute: attribute_def,
+                    rule: element_rule,
+                  ),
+                )
               end
             end
           end

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

@@ -42,21 +42,24 @@ module Lutaml
           @root.order
         end
 
-        def handle_nested_elements(builder, value, rule: nil, attribute: nil)
-          options = build_options_for_nested_elements(attribute, rule)
+        def handle_nested_elements(builder, value, options = {})
+          element_options = build_options_for_nested_elements(options)
 
           case value
           when Array
-            value.each { |val| build_element(builder, val, options) }
+            value.each { |val| build_element(builder, val, element_options) }
           else
-            build_element(builder, value, options)
+            build_element(builder, value, element_options)
           end
         end
 
-        def build_options_for_nested_elements(attribute, rule)
+        def build_options_for_nested_elements(options = {})
+          attribute = options.delete(:attribute)
+          rule = options.delete(:rule)
+
           return {} unless rule
 
-          options = {}
+          # options = {}
 
           options[:namespace_prefix] = rule.prefix if rule&.namespace_set?
           options[:mixed_content] = rule.mixed_content
@@ -97,7 +100,18 @@ module Lutaml
           end
         end
 
-        def add_to_xml(xml, prefix, value, attribute, rule)
+        def add_to_xml(xml, prefix, value, options = {})
+          if value.is_a?(Array)
+            value.each do |item|
+              add_to_xml(xml, prefix, item, options)
+            end
+
+            return
+          end
+
+          attribute = options[:attribute]
+          rule = options[:rule]
+
           if rule.custom_methods[:to]
             @root.send(rule.custom_methods[:to], @root, xml.parent, xml)
             return
@@ -107,8 +121,7 @@ module Lutaml
             handle_nested_elements(
               xml,
               value,
-              rule: rule,
-              attribute: attribute,
+              options.merge({ rule: rule, attribute: attribute }),
             )
           else
             xml.create_and_add_element(rule.name, prefix: prefix) do
@@ -136,7 +149,7 @@ module Lutaml
 
           attributes = options[:xml_attributes] ||= {}
           attributes = build_attributes(element,
-                                        xml_mapping).merge(attributes)&.compact
+                                        xml_mapping, options).merge(attributes)&.compact
 
           prefix = if options.key?(:namespace_prefix)
                      options[:namespace_prefix]
@@ -147,30 +160,28 @@ module Lutaml
           prefixed_xml = xml.add_namespace_prefix(prefix)
           tag_name = options[:tag_name] || xml_mapping.root_element
 
-          xml.create_and_add_element(tag_name, prefix: prefix,
-                                               attributes: attributes) do
+          prefixed_xml.create_and_add_element(tag_name, prefix: prefix,
+                                                        attributes: attributes) do
             if options.key?(:namespace_prefix) && !options[:namespace_prefix]
-              xml.add_namespace_prefix(nil)
+              prefixed_xml.add_namespace_prefix(nil)
             end
 
             xml_mapping.elements.each do |element_rule|
               attribute_def = attribute_definition_for(element, element_rule,
                                                        mapper_class: mapper_class)
+
               value = attribute_value_for(element, element_rule)
 
               next if value.nil? && !element_rule.render_nil?
 
-              if attribute_def.collection?
-                value = [value] unless value.is_a?(Array)
+              value = [value] if attribute_def.collection? && !value.is_a?(Array)
 
-                value.each do |v|
-                  add_to_xml(xml, element_rule.prefix, v, attribute_def,
-                             element_rule)
-                end
-              elsif !value.nil? || element_rule.render_nil?
-                add_to_xml(xml, element_rule.prefix, value, attribute_def,
-                           element_rule)
-              end
+              add_to_xml(
+                prefixed_xml,
+                element_rule.prefix,
+                value,
+                options.merge({ attribute: attribute_def, rule: element_rule }),
+              )
             end
 
             if (content_rule = xml_mapping.content_mapping)
@@ -201,9 +212,11 @@ module Lutaml
 
           attrs = {}
 
-          if xml_mappings.namespace_prefix
-            attrs["xmlns:#{xml_mappings.namespace_prefix}"] =
-              xml_mappings.namespace_uri
+          if xml_mappings.namespace_uri
+            prefixed_name = ["xmlns",
+                             xml_mappings.namespace_prefix].compact.join(":")
+
+            attrs[prefixed_name] = xml_mappings.namespace_uri
           end
 
           xml_mappings.mappings.each do |mapping_rule|
@@ -231,10 +244,12 @@ module Lutaml
           attrs
         end
 
-        def build_attributes(element, xml_mapping)
+        def build_attributes(element, xml_mapping, options = {})
           attrs = namespace_attributes(xml_mapping)
 
           xml_mapping.attributes.each_with_object(attrs) do |mapping_rule, hash|
+            next if options[:except]&.include?(mapping_rule.to)
+
             if mapping_rule.namespace
               hash["xmlns:#{mapping_rule.prefix}"] = mapping_rule.namespace
             end
@@ -243,6 +258,8 @@ module Lutaml
           end
 
           xml_mapping.elements.each_with_object(attrs) do |mapping_rule, hash|
+            next if options[:except]&.include?(mapping_rule.to)
+
             if mapping_rule.namespace
               hash["xmlns:#{mapping_rule.prefix}"] = mapping_rule.namespace
             end

data/lib/lutaml/model/xml_mapping.rb

@@ -44,8 +44,7 @@ module Lutaml
         delegate: nil,
         namespace: (namespace_set = false
                     nil),
-        prefix: nil,
-        mixed: false
+        prefix: nil
       )
         @elements[name] = XmlMappingRule.new(
           name,
@@ -55,7 +54,6 @@ module Lutaml
           delegate: delegate,
           namespace: namespace,
           prefix: prefix,
-          mixed_content: mixed,
           namespace_set: namespace_set != false,
         )
       end

data/lutaml-model.gemspec

@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
   end
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
+  spec.add_dependency "bigdecimal"
   spec.add_dependency "thor"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement