lutaml-model 0.3.16 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9687a8a307de8226b41a87abda56626627eefe47665628c0e9112b97f27385a
-  data.tar.gz: e819f531048e629d4943ea7b613815a568990f372ef2da93162d0d1b4d8395cd
+  metadata.gz: fba4d6c61d5d3e174461bbf07c8a7db59169565726c93472680fa146e833f309
+  data.tar.gz: 1de02cedf4b5eb2e1971e26960d313831f15214e40fbd89657d5da781b289ad4
 SHA512:
-  metadata.gz: f47d1336093db1eb45c5225913a9c63d66681de77d5803a21702baab0ca8e571e882a2d8f6f6dcf7b9180c897c9ae8bfd4b2db6532e9691487d104696657457e
-  data.tar.gz: 9ec8b8d841606d202acdcca81464761cc0f75e9ae5b35d2c3b8dd01c6e8a122642a348f41de2852b09386d3748eb61b1b2547df8d1ccb146a7d36e5a8ac46257
+  metadata.gz: 4c02cb07f6e85f5272e821cffebed2e2b179580a76441641401a8f321a9cf3901dce21022eb846e5d2cd8a6ec1fd9fca4cb7187d6b3a736c191c8697605b0180
+  data.tar.gz: 84512d6d0695a2176a8c31869fad1f7f3ebbd8449abc0cf44d017bca081ef85c95f4834931842b9e8f9a9b68e143af45ec6ea642445ab82413501727b1fd6818

data/README.adoc

@@ -464,6 +464,7 @@ class Glaze < Lutaml::Model::Serializable
   end
 end
 ----
+====
 
 .Attributes with `render_default: true` are rendered when the value is identical to the default
 [example]
@@ -741,6 +742,7 @@ end
 > Example.new(value: 12).to_xml
 > #<example value="12"></example>
 ----
+====
 
 The `map_attribute` method does not inherit the root element's namespace.
 To specify a namespace for an attribute, please explicitly declare the

data/lib/lutaml/model/mapping_hash.rb

@@ -1,7 +1,7 @@
 module Lutaml
   module Model
     class MappingHash < Hash
-      attr_accessor :ordered
+      attr_accessor :ordered, :node
 
       def initialize
         @ordered = false

data/lib/lutaml/model/serialize.rb

@@ -397,7 +397,7 @@ module Lutaml
                     value
                   end
 
-          if attr && !rule.content_mapping?
+          if attr && !rule.content_mapping? && !rule.custom_methods[:from]
             value = attr.cast(
               value,
               :xml,

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.3.16"
+    VERSION = "0.3.18"
   end
 end

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

@@ -54,7 +54,7 @@ module Lutaml
               element = element.xml.parent
             end
 
-            add_element(element, ::Nokogiri::XML::Text.new(text.to_s, xml.doc))
+            element << text.to_s
           end
 
           def add_namespace_prefix(prefix)

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

@@ -15,7 +15,7 @@ module Lutaml
         def to_xml(options = {})
           builder = Builder::Nokogiri.build(encoding: "UTF-8") do |xml|
             if root.is_a?(Lutaml::Model::XmlAdapter::NokogiriElement)
-              root.to_xml(xml)
+              root.build_xml(xml)
             else
               mapper_class = options[:mapper_class] || @root.class
               options[:xml_attributes] =
@@ -49,6 +49,7 @@ module Lutaml
                          end
 
           tag_name = options[:tag_name] || xml_mapping.root_element
+          tag_name = "#{tag_name}_" if prefixed_xml.respond_to?(tag_name)
           prefixed_xml.public_send(tag_name, attributes) do
             if options.key?(:namespace_prefix) && !options[:namespace_prefix]
               xml.parent.namespace = nil
@@ -72,11 +73,9 @@ module Lutaml
                 text = xml_mapping.content_mapping.serialize(element)
                 text = text[curr_index] if text.is_a?(Array)
 
-                if element.mixed?
-                  prefixed_xml.text text
-                else
-                  content << text
-                end
+                next prefixed_xml.text(text) if element.mixed?
+
+                content << text
               elsif !value.nil? || element_rule.render_nil?
                 value = value[curr_index] if attribute_def.collection?
 
@@ -88,6 +87,7 @@ module Lutaml
                   options.merge(
                     attribute: attribute_def,
                     rule: element_rule,
+                    mapper_class: mapper_class,
                   ),
                 )
               end
@@ -123,9 +123,11 @@ module Lutaml
               namespace_prefix: attr.namespace&.prefix,
             )
           end
+
           default_namespace = node.namespace&.href if root_node.nil?
+
           super(
-            node.name,
+            node,
             attributes,
             parse_all_children(node, root_node: root_node || self, default_namespace: default_namespace),
             node.text,
@@ -140,7 +142,13 @@ module Lutaml
           children.empty? && text.length.positive?
         end
 
-        def to_xml(builder = nil)
+        def to_xml
+          return text if text?
+
+          build_xml.doc.root.to_xml
+        end
+
+        def build_xml(builder = nil)
           builder ||= Builder::Nokogiri.build
 
           if name == "text"
@@ -148,7 +156,7 @@ module Lutaml
           else
             builder.public_send(name, build_attributes(self)) do |xml|
               children.each do |child|
-                child.to_xml(xml)
+                child.build_xml(xml)
               end
             end
           end

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

@@ -16,7 +16,7 @@ module Lutaml
           builder = Builder::Ox.build
 
           if @root.is_a?(Lutaml::Model::XmlAdapter::OxElement)
-            @root.to_xml(builder)
+            @root.build_xml(builder)
           elsif ordered?(@root, options)
             build_ordered_element(builder, @root, options)
           else
@@ -117,7 +117,7 @@ module Lutaml
             end
 
             super(
-              node.name.to_s,
+              node,
               attributes,
               parse_children(node, root_node: root_node || self),
               node.text,
@@ -126,7 +126,13 @@ module Lutaml
           end
         end
 
-        def to_xml(builder = nil)
+        def to_xml
+          return text if text?
+
+          build_xml.xml.to_s
+        end
+
+        def build_xml(builder = nil)
           builder ||= Builder::Ox.build
           attrs = build_attributes(self)
 
@@ -134,9 +140,11 @@ module Lutaml
             builder.add_text(builder, text)
           else
             builder.create_and_add_element(name, attributes: attrs) do |el|
-              children.each { |child| child.to_xml(el) }
+              children.each { |child| child.build_xml(el) }
             end
           end
+
+          builder
         end
 
         def namespace_attributes(attributes)

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

@@ -73,6 +73,7 @@ module Lutaml
 
         def parse_element(element, klass = nil, format = nil)
           result = Lutaml::Model::MappingHash.new
+          result.node = element
           result.item_order = element.order
 
           element.children.each_with_object(result) do |child, hash|
@@ -81,11 +82,7 @@ module Lutaml
             value = if child.text?
                       child.text
                     elsif attr&.raw?
-                      child.children.map do |c|
-                        next c.text if c.text?
-
-                        c.to_xml.doc.root.to_xml({})
-                      end.join
+                      child.children.map(&:to_xml).join
                     else
                       parse_element(child, attr&.type || klass, format)
                     end

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

@@ -10,8 +10,10 @@ module Lutaml
                     :namespace_prefix,
                     :parent_document
 
+        attr_accessor :adapter_node
+
         def initialize(
-          name,
+          node,
           attributes = {},
           children = [],
           text = nil,
@@ -19,13 +21,22 @@ module Lutaml
           namespace_prefix: nil,
           default_namespace: nil
         )
-          @name = extract_name(name)
-          @namespace_prefix = namespace_prefix || extract_namespace_prefix(name)
-          @attributes = attributes # .map { |k, v| XmlAttribute.new(k, v) }
+          @name = extract_name(node)
+          @namespace_prefix = namespace_prefix || extract_namespace_prefix(node)
+          @attributes = attributes
           @children = children
           @text = text
           @parent_document = parent_document
           @default_namespace = default_namespace
+
+          self.adapter_node = node
+        end
+
+        # This tells which attributes to pretty print, So we remove the
+        # @parent_document and @adapter_node because they were causing
+        # so much repeatative output.
+        def pretty_print_instance_variables
+          (instance_variables - %i[@adapter_node @parent_document]).sort
         end
 
         def name
@@ -79,20 +90,32 @@ module Lutaml
           namespaces[nil] || @parent_document&.namespaces&.dig(nil)
         end
 
-        def extract_name(name)
-          n = name.to_s.split(":")
+        def extract_name(node)
+          name = name_from_node(node)
+
+          n = name.split(":")
           return name if n.length <= 1
 
           n[1..].join(":")
         end
 
-        def extract_namespace_prefix(name)
+        def extract_namespace_prefix(node)
+          name = name_from_node(node)
+
           n = name.to_s.split(":")
           return if n.length <= 1
 
           n.first
         end
 
+        def name_from_node(node)
+          if node.is_a?(String)
+            node
+          else
+            node.name.to_s
+          end
+        end
+
         def order
           children.each_with_object([]) do |child, arr|
             arr << child.unprefixed_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.18
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor