lutaml-model 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b36d07a850d4736c0634735a198f05dd34c49b906cd1265b3dd49266931eb22
-  data.tar.gz: cefd0559ad4010ecd2ab0a547ab87493b4958a480f6cb19ab317c248836b8f75
+  metadata.gz: 59ac2ffbc292a5e34dbbbf79441a8220a48954ba5acd21d2780235281bfbbee2
+  data.tar.gz: 253892694acb1359120e6401d83e05bc2daa2f371b69f667210c048c08f2336c
 SHA512:
-  metadata.gz: 83fac7632d0eec4f5bd4339132b36d267877932cf34839eac6dbdefd0cd0e551988b73b3cd379b856af0df351e42694c157342efd8baba67e283e71d34b88171
-  data.tar.gz: 6befe6bfce13fb6175a04f8e0ac81794304d3c56c51feea343334c501346cba517db1f89ab3387ea3300e546d160d24af264048e9762c85debc4063300d57025
+  metadata.gz: 920de33ce2cc20336fa2ed87c3a2d5743f4016c8a400a881c91e4eafee0452e3fdc110429f3e71b7216f84694e546b26848c50323bc25397d32c8a1aa2e6901e
+  data.tar.gz: 3685a35624c0c355ee457241a308bf9e46c37c9a7b14994948a897c9210a13229c2a2832d8f595b2d83a4bf96660f1ea2b9843c83ea8ba9a73978ef67e864818

data/.rubocop_todo.yml

@@ -72,7 +72,7 @@ Metrics/MethodLength:
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
-  Max: 12
+  Max: 13
 
 # Offense count: 22
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.

data/lib/lutaml/model/attribute.rb

@@ -54,6 +54,10 @@ module Lutaml
         @raw
       end
 
+      def render_default?
+        !!@options[:render_default]
+      end
+
       def default
         value = if delegate
                   type.attributes[to].default

data/lib/lutaml/model/mapping_rule.rb

@@ -4,6 +4,8 @@ module Lutaml
       attr_reader :name,
                   :to,
                   :render_nil,
+                  :render_default,
+                  :attribute,
                   :custom_methods,
                   :delegate
 
@@ -11,6 +13,7 @@ module Lutaml
         name,
         to:,
         render_nil: false,
+        render_default: false,
         with: {},
         attribute: false,
         delegate: nil
@@ -18,6 +21,7 @@ module Lutaml
         @name = name
         @to = to
         @render_nil = render_nil
+        @render_default = render_default
         @custom_methods = with
         @attribute = attribute
         @delegate = delegate
@@ -25,6 +29,8 @@ module Lutaml
 
       alias from name
       alias render_nil? render_nil
+      alias render_default? render_default
+      alias attribute? attribute
 
       def serialize_attribute(model, element, doc)
         if custom_methods[:to]

data/lib/lutaml/model/serialize.rb

@@ -86,6 +86,7 @@ module Lutaml
           end
 
           define_method(:"#{name}=") do |value|
+            value_set_for(name)
             instance_variable_set(:"@#{name}", attr.cast_value(value))
           end
         end
@@ -304,33 +305,7 @@ module Lutaml
           return instance if Utils.blank?(doc)
           return apply_xml_mapping(doc, instance, options) if format == :xml
 
-          mappings = mappings_for(format).mappings
-          mappings.each do |rule|
-            raise "Attribute '#{rule.to}' not found in #{self}" unless valid_rule?(rule)
-
-            attr = attribute_for_rule(rule)
-
-            value = if doc.key?(rule.name) || doc.key?(rule.name.to_sym)
-                      doc[rule.name] || doc[rule.name.to_sym]
-                    else
-                      attr.default
-                    end
-
-            if rule.custom_methods[:from]
-              if Utils.present?(value)
-                value = new.send(rule.custom_methods[:from], instance, value)
-              end
-
-              next
-            end
-
-            value = apply_child_mappings(value, rule.child_mappings)
-            value = attr.cast(value, format)
-
-            rule.deserialize(instance, value, attributes, self)
-          end
-
-          instance
+          apply_hash_mapping(doc, instance, format, options)
         end
 
         def apply_xml_mapping(doc, instance, options = {})
@@ -357,6 +332,8 @@ module Lutaml
             )
           end
 
+          defaults_used = []
+
           mappings.each do |rule|
             raise "Attribute '#{rule.to}' not found in #{self}" unless valid_rule?(rule)
 
@@ -365,6 +342,7 @@ module Lutaml
                     elsif doc.key_exist?(rule.namespaced_name)
                       doc.fetch(rule.namespaced_name)
                     else
+                      defaults_used << rule.to
                       rule.to_value_for(instance)
                     end
 
@@ -372,6 +350,40 @@ module Lutaml
             rule.deserialize(instance, value, attributes, self)
           end
 
+          defaults_used.each do |attribute_name|
+            instance.using_default_for(attribute_name) if instance.respond_to?(:using_default_for)
+          end
+
+          instance
+        end
+
+        def apply_hash_mapping(doc, instance, format, _options = {})
+          mappings = mappings_for(format).mappings
+          mappings.each do |rule|
+            raise "Attribute '#{rule.to}' not found in #{self}" unless valid_rule?(rule)
+
+            attr = attribute_for_rule(rule)
+
+            value = if doc.key?(rule.name) || doc.key?(rule.name.to_sym)
+                      doc[rule.name] || doc[rule.name.to_sym]
+                    else
+                      attr.default
+                    end
+
+            if rule.custom_methods[:from]
+              if Utils.present?(value)
+                value = new.send(rule.custom_methods[:from], instance, value)
+              end
+
+              next
+            end
+
+            value = apply_child_mappings(value, rule.child_mappings)
+            value = attr.cast(value, format)
+
+            rule.deserialize(instance, value, attributes, self)
+          end
+
           instance
         end
 
@@ -433,6 +445,7 @@ module Lutaml
 
       def initialize(attrs = {})
         @validate_on_set = attrs.delete(:validate_on_set) || false
+        @using_default ||= {}
 
         return unless self.class.attributes
 
@@ -449,6 +462,7 @@ module Lutaml
           value = if attrs.key?(name) || attrs.key?(name.to_s)
                     self.class.attr_value(attrs, name, attr)
                   else
+                    using_default_for(name)
                     attr.default
                   end
 
@@ -461,6 +475,18 @@ module Lutaml
         end
       end
 
+      def using_default_for(attribute_name)
+        @using_default[attribute_name] = true
+      end
+
+      def value_set_for(attribute_name)
+        @using_default[attribute_name] = false
+      end
+
+      def using_default?(attribute_name)
+        @using_default[attribute_name]
+      end
+
       def method_missing(method_name, *args)
         if method_name.to_s.end_with?("=") && self.class.attributes.key?(method_name.to_s.chomp("=").to_sym)
           define_singleton_method(method_name) do |value|

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.3.14"
+    VERSION = "0.3.15"
   end
 end

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

@@ -143,6 +143,8 @@ module Lutaml
             return
           end
 
+          return if !render_element?(rule, element, value)
+
           if value && (attribute&.type&.<= Lutaml::Model::Serialize)
             handle_nested_elements(
               xml,
@@ -254,6 +256,20 @@ module Lutaml
           rule.nil? || !rule.namespace_set? || !rule.namespace.nil?
         end
 
+        def render_element?(rule, element, value)
+          render_default?(rule, element) && render_value?(rule, value)
+        end
+
+        def render_value?(rule, value)
+          rule.attribute? || rule.render_nil? || !value.nil?
+        end
+
+        def render_default?(rule, element)
+          !element.respond_to?(:using_default?) ||
+            rule.render_default? ||
+            !element.using_default?(rule.to)
+        end
+
         def build_namespace_attributes(klass, processed = {}, options = {})
           xml_mappings = klass.mappings_for(:xml)
           attributes = klass.attributes
@@ -315,7 +331,9 @@ module Lutaml
               hash["xmlns:#{mapping_rule.prefix}"] = mapping_rule.namespace
             end
 
-            hash[mapping_rule.prefixed_name] = mapping_rule.to_value_for(element)
+            if render_element?(mapping_rule, element, mapping_rule.to_value_for(element))
+              hash[mapping_rule.prefixed_name] = mapping_rule.to_value_for(element)
+            end
           end
 
           xml_mapping.elements.each_with_object(attrs) do |mapping_rule, hash|

data/lib/lutaml/model/xml_mapping.rb

@@ -43,6 +43,7 @@ module Lutaml
         name,
         to: nil,
         render_nil: false,
+        render_default: false,
         with: {},
         delegate: nil,
         namespace: (namespace_set = false
@@ -56,6 +57,7 @@ module Lutaml
           name,
           to: to,
           render_nil: render_nil,
+          render_default: render_default,
           with: with,
           delegate: delegate,
           namespace: namespace,
@@ -71,6 +73,7 @@ module Lutaml
         name,
         to: nil,
         render_nil: false,
+        render_default: false,
         with: {},
         delegate: nil,
         namespace: (namespace_set = false
@@ -84,6 +87,7 @@ module Lutaml
           name,
           to: to,
           render_nil: render_nil,
+          render_default: render_default,
           with: with,
           delegate: delegate,
           namespace: namespace,
@@ -101,6 +105,7 @@ module Lutaml
       def map_content(
         to: nil,
         render_nil: false,
+        render_default: false,
         with: {},
         delegate: nil,
         mixed: false
@@ -111,6 +116,7 @@ module Lutaml
           nil,
           to: to,
           render_nil: render_nil,
+          render_default: render_default,
           with: with,
           delegate: delegate,
           mixed_content: mixed,

data/lib/lutaml/model/xml_mapping_rule.rb

@@ -9,6 +9,7 @@ module Lutaml
         name,
         to:,
         render_nil: false,
+        render_default: false,
         with: {},
         delegate: nil,
         namespace: nil,
@@ -23,6 +24,7 @@ module Lutaml
           name,
           to: to,
           render_nil: render_nil,
+          render_default: render_default,
           with: with,
           delegate: delegate,
           attribute: attribute,

metadata

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