lutaml-model 0.3.0 → 0.3.1

data/lib/lutaml/model/xml_adapter.rb

@@ -44,12 +44,8 @@ module Lutaml
           @root.order
         end
 
-        def handle_nested_elements(builder, value, rule = nil)
-          options = {}
-
-          if rule&.namespace_set?
-            options[:namespace_prefix] = rule.prefix
-          end
+        def handle_nested_elements(builder, value, rule: nil, attribute: nil)
+          options = build_options_for_nested_elements(attribute, rule)
 
           case value
           when Array
@@ -59,6 +55,19 @@ module Lutaml
           end
         end
 
+        def build_options_for_nested_elements(attribute, rule)
+          return {} unless rule
+
+          options = {}
+
+          options[:namespace_prefix] = rule.prefix if rule&.namespace_set?
+          options[:mixed_content] = rule.mixed_content
+
+          options[:mapper_class] = attribute&.type if attribute
+
+          options
+        end
+
         def parse_element(element)
           result = Lutaml::Model::MappingHash.new
           result.item_order = element.order
@@ -81,14 +90,23 @@ module Lutaml
           result
         end
 
-        def build_element(xml, element, _options = {})
-          if element.ordered?
-            build_ordered_element(xml, element, _options)
+        def build_element(xml, element, options = {})
+          if ordered?(element, options)
+            build_ordered_element(xml, element, options)
           else
-            build_unordered_element(xml, element, _options)
+            build_unordered_element(xml, element, options)
           end
         end
 
+        def ordered?(element, options = {})
+          return false unless element.respond_to?(:element_order)
+          return element.ordered? if element.respond_to?(:ordered?)
+          return options[:mixed_content] if options.key?(:mixed_content)
+
+          mapper_class = options[:mapper_class]
+          mapper_class ? mapper_class.mappings_for(:xml).mixed_content? : false
+        end
+
         def build_namespace_attributes(klass, processed = {})
           xml_mappings = klass.mappings_for(:xml)
           attributes = klass.attributes
@@ -143,8 +161,9 @@ module Lutaml
           end
         end
 
-        def attribute_definition_for(element, rule)
-          return element.class.attributes[rule.to] unless rule.delegate
+        def attribute_definition_for(element, rule, mapper_class: nil)
+          klass = mapper_class || element.class
+          return klass.attributes[rule.to] unless rule.delegate
 
           element.send(rule.delegate).class.attributes[rule.to]
         end

data/lib/lutaml/model/yaml_adapter.rb

@@ -4,9 +4,17 @@ require "yaml"
 module Lutaml
   module Model
     module YamlAdapter
-      module Standard
-        def self.to_yaml(model, *args)
-          YAML.dump(model.hash_representation(:yaml), *args)
+      class Standard
+        def initialize(attributes)
+          @attributes = attributes
+        end
+
+        def to_yaml(options = {})
+          YAML.dump(@attributes, options)
+        end
+
+        def self.to_yaml(attributes, *args)
+          new(attributes).to_yaml(*args)
         end
 
         def self.from_yaml(yaml, klass)

data/lib/lutaml/model.rb

@@ -12,9 +12,16 @@ require_relative "model/json_adapter"
 require_relative "model/yaml_adapter"
 require_relative "model/xml_adapter"
 require_relative "model/toml_adapter"
+require_relative "model/error"
 
 module Lutaml
   module Model
+    # Error for passing incorrect model type
+    #
+    # @api private
+    class IncorrectModelError < StandardError
+    end
+
     class BaseModel < Serializable
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies: []
 description: 'LutaML creating data models in Ruby
 
@@ -34,6 +34,8 @@ files:
 - lib/lutaml/model.rb
 - lib/lutaml/model/attribute.rb
 - lib/lutaml/model/config.rb
+- lib/lutaml/model/error.rb
+- lib/lutaml/model/error/invalid_value_error.rb
 - lib/lutaml/model/json_adapter.rb
 - lib/lutaml/model/json_adapter/multi_json.rb
 - lib/lutaml/model/json_adapter/standard.rb