lutaml-model 0.3.9 → 0.3.11

data/lib/lutaml/model/validation.rb

@@ -0,0 +1,24 @@
+module Lutaml
+  module Model
+    module Validation
+      def validate
+        errors = []
+        self.class.attributes.each do |name, attr|
+          value = instance_variable_get(:"@#{name}")
+          begin
+            attr.validate_value!(value)
+          rescue Lutaml::Model::InvalidValueError,
+                 Lutaml::Model::CollectionCountOutOfRangeError => e
+            errors << e
+          end
+        end
+        errors
+      end
+
+      def validate!
+        errors = validate
+        raise Lutaml::Model::ValidationError.new(errors) if errors.any?
+      end
+    end
+  end
+end

data/lib/lutaml/model/version.rb

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

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

@@ -27,11 +27,21 @@ module Lutaml
             element.add_child(child)
           end
 
-          def create_and_add_element(element_name, prefix: nil, attributes: {})
-            add_namespace_prefix(prefix) if prefix
+          def add_attribute(element, name, value)
+            element[name] = value
+          end
+
+          def create_and_add_element(
+            element_name,
+            prefix: (prefix_unset = true
+                     nil),
+            attributes: {}
+          )
+            add_namespace_prefix(prefix)
 
             if block_given?
               public_send(element_name, attributes) do
+                xml.parent.namespace = nil if prefix.nil? && !prefix_unset
                 yield(self)
               end
             else

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

@@ -38,6 +38,10 @@ module Lutaml
             element << child
           end
 
+          def add_attribute(element, name, value)
+            element[name] = value
+          end
+
           def create_and_add_element(element_name, prefix: nil, attributes: {})
             prefixed_name = if prefix
                               "#{prefix}:#{element_name}"

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

@@ -68,7 +68,7 @@ module Lutaml
               value = attribute_value_for(element, element_rule)
 
               if element_rule == xml_mapping.content_mapping
-                text = element.send(xml_mapping.content_mapping.to)
+                text = xml_mapping.content_mapping.serialize(element)
                 text = text[curr_index] if text.is_a?(Array)
 
                 prefixed_xml.text text
@@ -77,6 +77,7 @@ module Lutaml
 
                 add_to_xml(
                   xml,
+                  element,
                   element_rule.prefix,
                   value,
                   options.merge(

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

@@ -64,6 +64,7 @@ module Lutaml
 
                 add_to_xml(
                   el,
+                  element,
                   nil,
                   value,
                   options.merge(

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

@@ -77,16 +77,23 @@ module Lutaml
           element.children.each_with_object(result) do |child, hash|
             value = child.text? ? child.text : parse_element(child)
 
-            if hash[child.unprefixed_name]
-              hash[child.unprefixed_name] =
-                [hash[child.unprefixed_name], value].flatten
-            else
-              hash[child.unprefixed_name] = value
-            end
+            hash[child.unprefixed_name] = if hash[child.unprefixed_name]
+                                            [hash[child.unprefixed_name], value].flatten
+                                          else
+                                            value
+                                          end
           end
 
           element.attributes.each_value do |attr|
-            result[attr.unprefixed_name] = attr.value
+            if attr.unprefixed_name == "schemaLocation"
+              result["__schema_location"] = {
+                namespace: attr.namespace,
+                prefix: attr.namespace_prefix,
+                schema_location: attr.value,
+              }
+            else
+              result[attr.unprefixed_name] = attr.value
+            end
           end
 
           result
@@ -100,10 +107,10 @@ module Lutaml
           end
         end
 
-        def add_to_xml(xml, prefix, value, options = {})
+        def add_to_xml(xml, element, prefix, value, options = {})
           if value.is_a?(Array)
             value.each do |item|
-              add_to_xml(xml, prefix, item, options)
+              add_to_xml(xml, element, prefix, item, options)
             end
 
             return
@@ -113,7 +120,7 @@ module Lutaml
           rule = options[:rule]
 
           if rule.custom_methods[:to]
-            @root.send(rule.custom_methods[:to], @root, xml.parent, xml)
+            options[:mapper_class].new.send(rule.custom_methods[:to], element, xml.parent, xml)
             return
           end
 
@@ -123,21 +130,29 @@ module Lutaml
               value,
               options.merge({ rule: rule, attribute: attribute }),
             )
-          else
+          elsif rule.prefix_set?
             xml.create_and_add_element(rule.name, prefix: prefix) do
-              if !value.nil?
-                serialized_value = attribute.type.serialize(value)
-
-                if attribute.type == Lutaml::Model::Type::Hash
-                  serialized_value.each do |key, val|
-                    xml.create_and_add_element(key) do |element|
-                      element.text(val)
-                    end
-                  end
-                else
-                  xml.add_text(xml, serialized_value)
+              add_value(xml, value, attribute)
+            end
+          else
+            xml.create_and_add_element(rule.name) do
+              add_value(xml, value, attribute)
+            end
+          end
+        end
+
+        def add_value(xml, value, attribute)
+          if !value.nil?
+            serialized_value = attribute.type.serialize(value)
+
+            if attribute.type == Lutaml::Model::Type::Hash
+              serialized_value.each do |key, val|
+                xml.create_and_add_element(key) do |element|
+                  element.text(val)
                 end
               end
+            else
+              xml.add_text(xml, serialized_value)
             end
           end
         end
@@ -150,6 +165,9 @@ module Lutaml
           attributes = options[:xml_attributes] ||= {}
           attributes = build_attributes(element,
                                         xml_mapping, options).merge(attributes)&.compact
+          if element.respond_to?(:schema_location) && element.schema_location
+            attributes.merge!(element.schema_location.to_xml_attributes)
+          end
 
           prefix = if options.key?(:namespace_prefix)
                      options[:namespace_prefix]
@@ -166,21 +184,28 @@ module Lutaml
               prefixed_xml.add_namespace_prefix(nil)
             end
 
+            xml_mapping.attributes.each do |attribute_rule|
+              attribute_rule.serialize_attribute(element, prefixed_xml.parent, xml)
+            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)
+              if attribute_def
+                value = attribute_value_for(element, element_rule)
 
-              next if value.nil? && !element_rule.render_nil?
+                next if value.nil? && !element_rule.render_nil?
 
-              value = [value] if attribute_def.collection? && !value.is_a?(Array)
+                value = [value] if attribute_def.collection? && !value.is_a?(Array)
+              end
 
               add_to_xml(
                 prefixed_xml,
+                element,
                 element_rule.prefix,
                 value,
-                options.merge({ attribute: attribute_def, rule: element_rule }),
+                options.merge({ attribute: attribute_def, rule: element_rule, mapper_class: mapper_class }),
               )
             end
 
@@ -189,7 +214,7 @@ module Lutaml
                 @root.send(content_rule.custom_methods[:to], element,
                            prefixed_xml.parent, prefixed_xml)
               else
-                text = element.send(content_rule.to)
+                text = content_rule.serialize(element)
                 text = text.join if text.is_a?(Array)
                 prefixed_xml.add_text(xml, text)
               end
@@ -213,8 +238,10 @@ module Lutaml
           attrs = {}
 
           if xml_mappings.namespace_uri
-            prefixed_name = ["xmlns",
-                             xml_mappings.namespace_prefix].compact.join(":")
+            prefixed_name = [
+              "xmlns",
+              xml_mappings.namespace_prefix,
+            ].compact.join(":")
 
             attrs[prefixed_name] = xml_mappings.namespace_uri
           end
@@ -229,9 +256,11 @@ module Lutaml
             type = if mapping_rule.delegate
                      attributes[mapping_rule.delegate].type.attributes[mapping_rule.to].type
                    else
-                     attributes[mapping_rule.to].type
+                     attributes[mapping_rule.to]&.type
                    end
 
+            next unless type
+
             if type <= Lutaml::Model::Serialize
               attrs = attrs.merge(build_namespace_attributes(type, processed))
             end
@@ -249,6 +278,7 @@ module Lutaml
 
           xml_mapping.attributes.each_with_object(attrs) do |mapping_rule, hash|
             next if options[:except]&.include?(mapping_rule.to)
+            next if mapping_rule.custom_methods[:to]
 
             if mapping_rule.namespace
               hash["xmlns:#{mapping_rule.prefix}"] = mapping_rule.namespace

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

@@ -37,7 +37,7 @@ module Lutaml
         end
 
         def attr_name
-          if prefix && !prefix.empty?
+          if Utils.present?(prefix)
             "xmlns:#{prefix}"
           else
             "xmlns"

data/lib/lutaml/model/xml_mapping.rb

@@ -38,14 +38,17 @@ module Lutaml
       # rubocop:disable Metrics/ParameterLists
       def map_element(
         name,
-        to:,
+        to: nil,
         render_nil: false,
         with: {},
         delegate: nil,
         namespace: (namespace_set = false
                     nil),
-        prefix: nil
+        prefix: (prefix_set = false
+                 nil)
       )
+        validate!(name, to, with)
+
         @elements[name] = XmlMappingRule.new(
           name,
           to: to,
@@ -55,19 +58,23 @@ module Lutaml
           namespace: namespace,
           prefix: prefix,
           namespace_set: namespace_set != false,
+          prefix_set: prefix_set != false,
         )
       end
 
       def map_attribute(
         name,
-        to:,
+        to: nil,
         render_nil: false,
         with: {},
         delegate: nil,
         namespace: (namespace_set = false
                     nil),
-        prefix: nil
+        prefix: (prefix_set = false
+                 nil)
       )
+        validate!(name, to, with)
+
         @attributes[name] = XmlMappingRule.new(
           name,
           to: to,
@@ -77,18 +84,21 @@ module Lutaml
           namespace: namespace,
           prefix: prefix,
           namespace_set: namespace_set != false,
+          prefix_set: prefix_set != false,
         )
       end
 
       # rubocop:enable Metrics/ParameterLists
 
       def map_content(
-        to:,
+        to: nil,
         render_nil: false,
         with: {},
         delegate: nil,
         mixed: false
       )
+        validate!("content", to, with)
+
         @content_mapping = XmlMappingRule.new(
           nil,
           to: to,
@@ -99,6 +109,18 @@ module Lutaml
         )
       end
 
+      def validate!(key, to, with)
+        if to.nil? && with.empty?
+          msg = ":to or :with argument is required for mapping '#{key}'"
+          raise IncorrectMappingArgumentsError.new(msg)
+        end
+
+        if !with.empty? && (with[:from].nil? || with[:to].nil?)
+          msg = ":with argument for mapping '#{key}' requires :to and :from keys"
+          raise IncorrectMappingArgumentsError.new(msg)
+        end
+      end
+
       def elements
         @elements.values
       end

data/lib/lutaml/model/xml_mapping_rule.rb

@@ -14,7 +14,8 @@ module Lutaml
         namespace: nil,
         prefix: nil,
         mixed_content: false,
-        namespace_set: false
+        namespace_set: false,
+        prefix_set: false
       )
         super(
           name,
@@ -24,6 +25,7 @@ module Lutaml
           delegate: delegate,
           mixed_content: mixed_content,
           namespace_set: namespace_set,
+          prefix_set: prefix_set,
         )
 
         @namespace = if namespace.to_s == "inherit"

data/lib/lutaml/model/yaml_adapter/standard_yaml_adapter.rb

@@ -5,12 +5,17 @@ module Lutaml
   module Model
     module YamlAdapter
       class StandardYamlAdapter < YamlDocument
+        PERMITTED_CLASSES_BASE = [Date, Time, DateTime, Symbol, Hash,
+                                  Array].freeze
+
+        PERMITTED_CLASSES = if defined?(BigDecimal)
+                              PERMITTED_CLASSES_BASE + [BigDecimal]
+                            else
+                              PERMITTED_CLASSES_BASE
+                            end.freeze
+
         def self.parse(yaml)
-          YAML.safe_load(
-            yaml,
-            permitted_classes: [Date, Time, DateTime, Symbol,
-                                BigDecimal, Hash, Array],
-          )
+          YAML.safe_load(yaml, permitted_classes: PERMITTED_CLASSES)
         end
 
         def to_yaml(options = {})

data/lutaml-model.gemspec

@@ -30,6 +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"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-04 00:00:00.000000000 Z
+date: 2024-10-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
@@ -56,6 +42,7 @@ files:
 - ".rubocop_todo.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- LICENSE.md
 - README.adoc
 - Rakefile
 - bin/console
@@ -69,8 +56,12 @@ files:
 - lib/lutaml/model/comparison.rb
 - lib/lutaml/model/config.rb
 - lib/lutaml/model/error.rb
+- lib/lutaml/model/error/collection_count_out_of_range_error.rb
+- lib/lutaml/model/error/incorrect_mapping_argument_error.rb
 - lib/lutaml/model/error/invalid_value_error.rb
+- lib/lutaml/model/error/type_not_enabled_error.rb
 - lib/lutaml/model/error/unknown_adapter_type_error.rb
+- lib/lutaml/model/error/validation_error.rb
 - lib/lutaml/model/json_adapter.rb
 - lib/lutaml/model/json_adapter/json_document.rb
 - lib/lutaml/model/json_adapter/json_object.rb
@@ -86,6 +77,7 @@ files:
 - lib/lutaml/model/schema/relaxng_schema.rb
 - lib/lutaml/model/schema/xsd_schema.rb
 - lib/lutaml/model/schema/yaml_schema.rb
+- lib/lutaml/model/schema_location.rb
 - lib/lutaml/model/serializable.rb
 - lib/lutaml/model/serialize.rb
 - lib/lutaml/model/toml_adapter.rb
@@ -97,6 +89,7 @@ files:
 - lib/lutaml/model/type/date_time.rb
 - lib/lutaml/model/type/time_without_date.rb
 - lib/lutaml/model/utils.rb
+- lib/lutaml/model/validation.rb
 - lib/lutaml/model/version.rb
 - lib/lutaml/model/xml_adapter.rb
 - lib/lutaml/model/xml_adapter/builder/nokogiri.rb
@@ -119,7 +112,8 @@ files:
 homepage: https://github.com/lutaml/lutaml-model
 licenses:
 - BSD-2-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: