lutaml-model 0.3.17 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8df6fb14ce661ef1c54be01a1b21c0f5e35937d701846807f036f2b97fdb06d
-  data.tar.gz: 92fcc49f083dcb5def7133c8e643ec17b88fd216150061c2c76bf40183f550d3
+  metadata.gz: fa234d9dee0cbe45d559e6f4141d81ac6eecbb8c931afa77ec82f5d6d9129267
+  data.tar.gz: cee349d535ecbc950629123438ca1d3d2161288984806d49857d2dd215e4d1ec
 SHA512:
-  metadata.gz: d701f87c169faa98f952f2ce669ae42721462f512b729caab789a120055b90e19507bcad012bb7ecd57b912fc5984b6a70b59f305c58d5b1a0c341a4c035118f
-  data.tar.gz: d2c411bd20127d21d1c9183cf485945e28288b54e6a45399b9e20c3eb9ca5157fa42b025f924a0a845d905e9db09de0d6ac28a136d8176e39a2d756b19a4729a
+  metadata.gz: d5825d1afeb2bef26607379380722a9506795cce5635132355785ddece46086f1a16644b7d7c8960c9f103816e80bdd97d8d01e7f2d1790c3328dfbe1afdab5c
+  data.tar.gz: 14bd971607b8420c45bf3cda5badc91ddfeeb82e83918e5eb85f529fe807b7c1c25e02480412db33b91d80cebc4c6f1929e14ca946d9ef2c9ec1ed621239d508

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.17"
+    VERSION = "0.3.19"
   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] =
@@ -73,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?
 
@@ -89,6 +87,7 @@ module Lutaml
                   options.merge(
                     attribute: attribute_def,
                     rule: element_rule,
+                    mapper_class: mapper_class,
                   ),
                 )
               end
@@ -124,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,
@@ -141,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"
@@ -149,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.17
+  version: 0.3.19
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor