lutaml-model 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9a3608f755616317667038ebd8f71368c23dcf935a7b07ad33d8efd1fa1df23
-  data.tar.gz: 9a69a3a03c401fa4a0eff423315dc979e4f5b87c28b28bf4b4d10b7f118b6a77
+  metadata.gz: c1c49d91f74f3454b6a0e2aaf34bfef142630fa77e98a509535b53b156f603e7
+  data.tar.gz: 12880e7b701bf68c2a77efad6148daeac040a1956f1f1e1a0d790657c79f346c
 SHA512:
-  metadata.gz: 612d55df7ef46e1266b6d6e2fa4a6e451862252895a8f8b66b0a1f42bb96d289fc28c160ee1e2d609bc4ebc4ce8db00d14a1fca3061e8465a2f867403f5672b0
-  data.tar.gz: 20235f85e8719fceb5a048dfcebf9f80e0a1c3c2d3bc2f6779fd0e1480d77c989adcc1bdedc661e440dbd861e7cf04682321626693281ac9c21920d45310f6b6
+  metadata.gz: '08020dbbadaea322601ce9c0536cf3a49aeaa44679d8caf278995d0f7b1c41ba12761897db7f54390bb1288c84ccedc6a0a45bee980926fecca18927a17c8de7'
+  data.tar.gz: 363806235f0d4308f127d84590d1b2d2bf2af5adafd27974fa6a8600f5e67afac6efc27f3ee810eea95265d6764b6f4538672f18c5c9a3e243c31f236595fe21

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-08-15 09:04:06 UTC using RuboCop version 1.65.1.
+# on 2024-08-16 03:28:27 UTC using RuboCop version 1.65.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
@@ -14,7 +14,7 @@ Gemspec/RequireMFA:
   Exclude:
     - 'lutaml-model.gemspec'
 
-# Offense count: 28
+# Offense count: 32
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
@@ -26,6 +26,7 @@ Layout/LineLength:
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
     - 'spec/lutaml/model/delegation_spec.rb'
+    - 'spec/lutaml/model/serializable_spec.rb'
 
 # Offense count: 20
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
@@ -82,7 +83,7 @@ RSpec/ContextWording:
     - 'spec/lutaml/model/xml_adapter/oga_adapter_spec.rb'
     - 'spec/lutaml/model/xml_adapter/ox_adapter_spec.rb'
 
-# Offense count: 63
+# Offense count: 64
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 35

data/README.adoc

@@ -401,6 +401,42 @@ end
 ----
 ====
 
+If an element is mapped to a model object with the XML `root` tag name set, the
+mapped tag name will be used as the root name, overriding the root name.
+
+.The mapped tag name is used as the root name
+[example]
+====
+[source,ruby]
+----
+class RecordDate < Lutaml::Model::Serializable
+  attribute :content, :string
+
+  xml do
+    root "recordDate"
+    map_content to: :content
+  end
+end
+
+class OriginInfo < Lutaml::Model::Serializable
+  attribute :date_issued, RecordDate, collection: true
+
+  xml do
+    root "originInfo"
+    map_element "dateIssued", to: :date_issued
+  end
+end
+----
+
+[source,ruby]
+----
+> RecordDate.new(date: "2021-01-01").to_xml
+> #<recordDate>2021-01-01</recordDate>
+> OriginInfo.new(date_issued: [RecordDate.new(date: "2021-01-01")]).to_xml
+> #<originInfo><dateIssued>2021-01-01</dateIssued></originInfo>
+----
+====
+
 ==== Mapping attributes
 
 The `map_attribute` method maps an XML attribute to a data model attribute.

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

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

@@ -48,7 +48,8 @@ module Lutaml
                            xml
                          end
 
-          prefixed_xml.public_send(xml_mapping.root_element, attributes) do
+          tag_name = options[:tag_name] || xml_mapping.root_element
+          prefixed_xml.public_send(tag_name, attributes) do
             if options.key?(:namespace_prefix) && !options[:namespace_prefix]
               xml.parent.namespace = nil
             end
@@ -94,7 +95,8 @@ module Lutaml
                            xml
                          end
 
-          prefixed_xml.public_send(xml_mapping.root_element, attributes) do
+          tag_name = options[:tag_name] || xml_mapping.root_element
+          prefixed_xml.public_send(tag_name, attributes) do
             if options.key?(:namespace_prefix) && !options[:namespace_prefix]
               xml.parent.namespace = nil
             end

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

@@ -36,12 +36,13 @@ module Lutaml
 
           attributes = build_attributes(element, xml_mapping).compact
 
+          tag_name = options[:tag_name] || xml_mapping.root_element
           prefixed_name = if options.key?(:namespace_prefix)
-                            [options[:namespace_prefix], xml_mapping.root_element].compact.join(":")
+                            [options[:namespace_prefix], tag_name].compact.join(":")
                           elsif xml_mapping.namespace_prefix
-                            "#{xml_mapping.namespace_prefix}:#{xml_mapping.root_element}"
+                            "#{xml_mapping.namespace_prefix}:#{tag_name}"
                           else
-                            xml_mapping.root_element
+                            tag_name
                           end
 
           builder.element(prefixed_name, attributes) do |el|
@@ -84,7 +85,8 @@ module Lutaml
 
           attributes = build_attributes(element, xml_mapping).compact
 
-          builder.element(xml_mapping.root_element, attributes) do |el|
+          tag_name = options[:tag_name] || xml_mapping.root_element
+          builder.element(tag_name, attributes) do |el|
             index_hash = {}
 
             element.element_order.each do |name|

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

@@ -60,6 +60,7 @@ module Lutaml
 
           options[:namespace_prefix] = rule.prefix if rule&.namespace_set?
           options[:mixed_content] = rule.mixed_content
+          options[:tag_name] = rule.name
 
           options[:mapper_class] = attribute&.type if attribute
 

data/lib/lutaml/model/xml_mapping.rb

@@ -9,8 +9,8 @@ module Lutaml
                   :mixed_content
 
       def initialize
-        @elements = []
-        @attributes = []
+        @elements = {}
+        @attributes = {}
         @content_mapping = nil
         @mixed_content = false
       end
@@ -47,7 +47,7 @@ module Lutaml
         prefix: nil,
         mixed: false
       )
-        @elements << XmlMappingRule.new(
+        @elements[name] = XmlMappingRule.new(
           name,
           to: to,
           render_nil: render_nil,
@@ -70,7 +70,7 @@ module Lutaml
                     nil),
         prefix: nil
       )
-        @attributes << XmlMappingRule.new(
+        @attributes[name] = XmlMappingRule.new(
           name,
           to: to,
           render_nil: render_nil,
@@ -102,11 +102,11 @@ module Lutaml
       end
 
       def elements
-        @elements
+        @elements.values
       end
 
       def attributes
-        @attributes
+        @attributes.values
       end
 
       def content_mapping

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-15 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies: []
 description: 'LutaML creating data models in Ruby