lutaml-model 0.3.15 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59ac2ffbc292a5e34dbbbf79441a8220a48954ba5acd21d2780235281bfbbee2
-  data.tar.gz: 253892694acb1359120e6401d83e05bc2daa2f371b69f667210c048c08f2336c
+  metadata.gz: d8df6fb14ce661ef1c54be01a1b21c0f5e35937d701846807f036f2b97fdb06d
+  data.tar.gz: 92fcc49f083dcb5def7133c8e643ec17b88fd216150061c2c76bf40183f550d3
 SHA512:
-  metadata.gz: 920de33ce2cc20336fa2ed87c3a2d5743f4016c8a400a881c91e4eafee0452e3fdc110429f3e71b7216f84694e546b26848c50323bc25397d32c8a1aa2e6901e
-  data.tar.gz: 3685a35624c0c355ee457241a308bf9e46c37c9a7b14994948a897c9210a13229c2a2832d8f595b2d83a4bf96660f1ea2b9843c83ea8ba9a73978ef67e864818
+  metadata.gz: d701f87c169faa98f952f2ce669ae42721462f512b729caab789a120055b90e19507bcad012bb7ecd57b912fc5984b6a70b59f305c58d5b1a0c341a4c035118f
+  data.tar.gz: d2c411bd20127d21d1c9183cf485945e28288b54e6a45399b9e20c3eb9ca5157fa42b025f924a0a845d905e9db09de0d6ac28a136d8176e39a2d756b19a4729a

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-10-23 12:15:48 UTC using RuboCop version 1.66.1.
+# on 2024-10-28 08:29:46 UTC using RuboCop version 1.66.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 139
+# Offense count: 148
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
@@ -69,7 +69,7 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   Max: 51
 
-# Offense count: 4
+# Offense count: 6
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 13
@@ -85,7 +85,7 @@ Metrics/PerceivedComplexity:
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
 
-# Offense count: 8
+# Offense count: 9
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -125,7 +125,7 @@ RSpec/MultipleDescribes:
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_adapter_spec.rb'
 
-# Offense count: 119
+# Offense count: 125
 RSpec/MultipleExpectations:
   Max: 14
 
@@ -134,6 +134,11 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 9
 
+# Offense count: 4
+# Configuration parameters: AllowedGroups.
+RSpec/NestedGroups:
+  Max: 4
+
 # Offense count: 7
 RSpec/PendingWithoutReason:
   Exclude:
@@ -153,13 +158,14 @@ RSpec/RepeatedExampleGroupDescription:
   Exclude:
     - 'spec/lutaml/model/collection_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
 # Include: **/*_spec.rb
 RSpec/SpecFilePathFormat:
   Exclude:
     - '**/spec/routing/**/*'
     - 'spec/lutaml/model/collection_spec.rb'
+    - 'spec/lutaml/model/defaults_spec.rb'
     - 'spec/lutaml/model/type/decimal_spec.rb'
 
 # Offense count: 1

data/README.adoc

@@ -390,7 +390,7 @@ acceptance of the newly updated component.
 ====
 
 
-=== Attribute value default
+=== Attribute value default and rendering defaults
 
 Specify default values for attributes using the `default` option.
 The `default` option can be set to a value or a lambda that returns a value.
@@ -423,6 +423,81 @@ end
 ----
 ====
 
+The "default behavior" (pun intended) is to not render a default value if
+the current value is the same as the default value.
+
+In certain cases, it is necessary to render the default value even if the
+current value is the same as the default value. This can be achieved by setting
+the `render_default` option to `true`.
+
+Syntax:
+
+[source,ruby]
+----
+attribute :name_of_attribute, Type, default: -> { value }, render_default: true
+----
+
+.Using the `render_default` option to force encoding the default value
+[example]
+====
+[source,ruby]
+----
+class Glaze < Lutaml::Model::Serializable
+  attribute :color, :string, default: -> { 'Clear' }
+  attribute :opacity, :string, default: -> { 'Opaque' }
+  attribute :temperature, :integer, default: -> { 1050 }
+  attribute :firing_time, :integer, default: -> { 60 }
+
+  xml do
+    root "glaze"
+    map_element 'color', to: :color
+    map_element 'opacity', to: :opacity, render_default: true
+    map_attribute 'temperature', to: :temperature
+    map_attribute 'firingTime', to: :firing_time, render_default: true
+  end
+
+  json do
+    map 'color', to: :color
+    map 'opacity', to: :opacity, render_default: true
+    map 'temperature', to: :temperature
+    map 'firingTime', to: :firing_time, render_default: true
+  end
+end
+----
+====
+
+.Attributes with `render_default: true` are rendered when the value is identical to the default
+[example]
+====
+[source,ruby]
+----
+> glaze_new = Glaze.new
+> puts glaze_new.to_xml
+# <glaze firingTime="60">
+#   <opacity>Opaque</opacity>
+# </glaze>
+> puts glaze_new.to_json
+# {"firingTime":60,"opacity":"Opaque"}
+----
+====
+
+.Attributes with `render_default: true` with non-default values are rendered
+[example]
+====
+[source,ruby]
+----
+> glaze = Glaze.new(color: 'Celadon', opacity: 'Semitransparent', temperature: 1300, firing_time: 90)
+> puts glaze.to_xml
+# <glaze color="Celadon" temperature="1300" firingTime="90">
+#   <opacity>Semitransparent</opacity>
+# </glaze>
+> puts glaze.to_json
+# {"color":"Celadon","temperature":1300,"firingTime":90,"opacity":"Semitransparent"}
+----
+====
+
+
+
 === Attribute as raw string
 
 An attribute can be set to read the value as raw string for XML, by using the `raw: true` option.
@@ -667,9 +742,12 @@ 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
+*namespace* and *prefix* in the `map_attribute` method.
 
-The map_attribute method does not inherit the root element's namespace. If you need to specify a namespace for an attribute,
-you must explicitly declare the namespace and prefix in the map_attribute method.
 [example]
 ====
 The following class will parse the XML snippet below:
@@ -1081,7 +1159,7 @@ end
 ----
 ====
 
-TODO: How to create mixed content from `#new`?
+// TODO: How to create mixed content from `#new`?
 
 [[xml-schema-location]]
 ==== Automatic support of `xsi:schemaLocation`
@@ -2020,7 +2098,9 @@ Lutaml::Model::Config.configure do |config|
 end
 ----
 
-NOTE: By default `yaml_adapter_type` and `json_adapter_type` are set to `:standard_yaml` and `:standard_json` respectively.
+NOTE: By default `yaml_adapter_type` and `json_adapter_type` are set to
+`:standard_yaml` and `:standard_json` respectively.
+
 
 === XML
 

data/lib/lutaml/model/attribute.rb

@@ -3,10 +3,20 @@ module Lutaml
     class Attribute
       attr_reader :name, :type, :options
 
+      ALLOWED_OPTIONS = %i[
+        raw
+        default
+        delegate
+        collection
+        values
+      ].freeze
+
       def initialize(name, type, options = {})
         @name = name
         @type = cast_type(type)
         @options = options
+        validate_options!
+
         @raw = !!options[:raw]
 
         if collection?
@@ -54,10 +64,6 @@ module Lutaml
         @raw
       end
 
-      def render_default?
-        !!@options[:render_default]
-      end
-
       def default
         value = if delegate
                   type.attributes[to].default
@@ -70,10 +76,6 @@ module Lutaml
         cast_value(value)
       end
 
-      def render_nil?
-        options.fetch(:render_nil, false)
-      end
-
       def enum_values
         @options.key?(:values) ? @options[:values] : []
       end
@@ -207,6 +209,14 @@ module Lutaml
           Lutaml::Model::Type.cast(value, type)
         end
       end
+
+      private
+
+      def validate_options!
+        if (options = @options.keys - ALLOWED_OPTIONS).any?
+          raise StandardError, "Invalid options given for `#{name}` #{options}"
+        end
+      end
     end
   end
 end

data/lib/lutaml/model/key_value_mapping.rb

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

data/lib/lutaml/model/key_value_mapping_rule.rb

@@ -9,6 +9,7 @@ module Lutaml
         name,
         to:,
         render_nil: false,
+        render_default: false,
         with: {},
         delegate: nil,
         child_mappings: nil
@@ -17,6 +18,7 @@ module Lutaml
           name,
           to: to,
           render_nil: render_nil,
+          render_default: render_default,
           with: with,
           delegate: delegate,
         )

data/lib/lutaml/model/serialize.rb

@@ -40,35 +40,30 @@ module Lutaml
         def model(klass = nil)
           if klass
             @model = klass
-            add_order_handling_methods_to_model(klass)
+            add_custom_handling_methods_to_model(klass)
           else
             @model
           end
         end
 
-        def add_order_handling_methods_to_model(klass)
-          Utils.add_method_if_not_defined(klass, :ordered=) do |ordered|
-            @ordered = ordered
-          end
-
-          Utils.add_method_if_not_defined(klass, :ordered?) do
-            !!@ordered
-          end
-
-          Utils.add_method_if_not_defined(klass, :mixed=) do |mixed|
-            @mixed = mixed
-          end
+        def add_custom_handling_methods_to_model(klass)
+          Utils.add_boolean_accessor_if_not_defined(klass, :ordered)
+          Utils.add_boolean_accessor_if_not_defined(klass, :mixed)
+          Utils.add_accessor_if_not_defined(klass, :element_order)
 
-          Utils.add_method_if_not_defined(klass, :mixed?) do
-            !!@mixed
+          Utils.add_method_if_not_defined(klass, :using_default_for) do |attribute_name|
+            @using_default ||= {}
+            @using_default[attribute_name] = true
           end
 
-          Utils.add_method_if_not_defined(klass, :element_order=) do |order|
-            @element_order = order
+          Utils.add_method_if_not_defined(klass, :value_set_for) do |attribute_name|
+            @using_default ||= {}
+            @using_default[attribute_name] = false
           end
 
-          Utils.add_method_if_not_defined(klass, :element_order) do
-            @element_order
+          Utils.add_method_if_not_defined(klass, :using_default?) do |attribute_name|
+            @using_default ||= {}
+            !!@using_default[attribute_name]
           end
         end
 
@@ -160,6 +155,7 @@ module Lutaml
           mappings.each_with_object({}) do |rule, hash|
             name = rule.to
             next if except&.include?(name) || (only && !only.include?(name))
+            next if !rule.render_default? && instance.using_default?(rule.to)
 
             next handle_delegate(instance, rule, hash, format) if rule.delegate
 
@@ -224,11 +220,10 @@ module Lutaml
           klass = format == :xml ? XmlMapping : KeyValueMapping
 
           klass.new.tap do |mapping|
-            attributes&.each do |name, attr|
+            attributes&.each_key do |name|
               mapping.map_element(
                 name.to_s,
                 to: name,
-                render_nil: attr.render_nil?,
               )
             end
 
@@ -351,7 +346,7 @@ module Lutaml
           end
 
           defaults_used.each do |attribute_name|
-            instance.using_default_for(attribute_name) if instance.respond_to?(:using_default_for)
+            instance.using_default_for(attribute_name)
           end
 
           instance

data/lib/lutaml/model/utils.rb

@@ -50,6 +50,34 @@ module Lutaml
           end
         end
 
+        def add_accessor_if_not_defined(klass, attribute)
+          add_getter_if_not_defined(klass, attribute)
+          add_setter_if_not_defined(klass, attribute)
+        end
+
+        def add_boolean_accessor_if_not_defined(klass, attribute)
+          add_boolean_getter_if_not_defined(klass, attribute)
+          add_setter_if_not_defined(klass, attribute)
+        end
+
+        def add_getter_if_not_defined(klass, attribute)
+          add_method_if_not_defined(klass, attribute) do
+            instance_variable_get(:"@__#{attribute}")
+          end
+        end
+
+        def add_boolean_getter_if_not_defined(klass, attribute)
+          add_method_if_not_defined(klass, "#{attribute}?") do
+            !!instance_variable_get(:"@__#{attribute}")
+          end
+        end
+
+        def add_setter_if_not_defined(klass, attribute)
+          add_method_if_not_defined(klass, "#{attribute}=") do |value|
+            instance_variable_set(:"@__#{attribute}", value)
+          end
+        end
+
         def deep_dup(hash)
           return hash if hash.nil?
 

data/lib/lutaml/model/version.rb

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

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

@@ -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

metadata

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