lutaml-model 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5140f93f22f4b05222edc408aeca50552082e447b71fddd724b34ba9e6b82d55
-  data.tar.gz: 0aa44a3c72b65cca0ed2b7411614d8cdb0c44b4e8293e183935cb45ba7818d7c
+  metadata.gz: 91ff48fd66cf1435e5e18508b24cc24f7cc92dc8b5d1619c7796932eb21dcea2
+  data.tar.gz: 51eabdb2aede716ce86cea46325cad0b7b9f0da98df3235fc3b8596fe9f96bd9
 SHA512:
-  metadata.gz: 69e4d0d0a3a5bd19e11a43fd33e03566ca035d18cf948a0a2fc5abe5f880489e4a6ad347d8118a04c35c8c95be5b7eb29ca93d426643c7790ab045db2b34721c
-  data.tar.gz: df1699ba6647f53f97735d0986b92bf8f76d6bf44430117406100b257f5934ac4a7baa6a4243bb8384db277ecb975bf64efe2f1a16b293739b245150e800cb15
+  metadata.gz: 3ce25727c43d1c25f97e49c529c9ded5f51d8f2c13ae2766dba8c94d2c1d9a7c646bad564bfb9cd4c5555ee71395f6ff39023268e9e92044f10985c20dd826ca
+  data.tar.gz: edf1d699e944a2427b947e1a262258e93623c44bc765a5f5497c13bd4d806984722ececd6318254c15196d435b2b809f44389a1be1d9cd5f33e005169b232eaf

data/.rubocop_todo.yml

@@ -1,25 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-09-10 23:53:08 UTC using RuboCop version 1.66.1.
+# on 2024-09-23 15:00:23 UTC using RuboCop version 1.65.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: 88
+# Offense count: 100
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'lib/lutaml/model/schema_location.rb'
-
 # Offense count: 11
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
@@ -37,12 +30,13 @@ Lint/DuplicateMethods:
   Exclude:
     - 'lib/lutaml/model/attribute.rb'
 
-# Offense count: 31
+# Offense count: 34
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
     - 'lib/lutaml/model/attribute.rb'
     - 'lib/lutaml/model/comparable_model.rb'
+    - 'lib/lutaml/model/mapping_rule.rb'
     - 'lib/lutaml/model/schema/relaxng_schema.rb'
     - 'lib/lutaml/model/schema/xsd_schema.rb'
     - 'lib/lutaml/model/serialize.rb'
@@ -51,13 +45,13 @@ Metrics/AbcSize:
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
 
-# Offense count: 6
+# Offense count: 4
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 42
 
-# Offense count: 25
+# Offense count: 26
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -69,17 +63,17 @@ Metrics/CyclomaticComplexity:
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
 
-# Offense count: 39
+# Offense count: 45
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 49
+  Max: 51
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
-  Max: 9
+  Max: 10
 
-# Offense count: 21
+# Offense count: 22
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -100,10 +94,10 @@ RSpec/ContextWording:
     - 'spec/lutaml/model/xml_adapter/ox_adapter_spec.rb'
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
 
-# Offense count: 101
+# Offense count: 105
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 57
+  Max: 54
 
 # Offense count: 2
 # Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
@@ -129,11 +123,11 @@ RSpec/MultipleDescribes:
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_adapter_spec.rb'
 
-# Offense count: 88
+# Offense count: 98
 RSpec/MultipleExpectations:
-  Max: 11
+  Max: 14
 
-# Offense count: 17
+# Offense count: 18
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 9
@@ -147,18 +141,24 @@ RSpec/PendingWithoutReason:
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_adapter_spec.rb'
 
+# Offense count: 1
+RSpec/RemoveConst:
+  Exclude:
+    - 'spec/lutaml/model/type/decimal_spec.rb'
+
 # Offense count: 2
 RSpec/RepeatedExampleGroupDescription:
   Exclude:
     - 'spec/lutaml/model/collection_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
 # Include: **/*_spec.rb
 RSpec/SpecFilePathFormat:
   Exclude:
     - '**/spec/routing/**/*'
     - 'spec/lutaml/model/collection_spec.rb'
+    - 'spec/lutaml/model/type/decimal_spec.rb'
 
 # Offense count: 1
 Security/CompoundHash:

data/Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in lutaml-model.gemspec
 gemspec
 
+gem "bigdecimal"
 gem "equivalent-xml"
 gem "multi_json"
 gem "nokogiri"

data/LICENSE.md

@@ -0,0 +1,33 @@
+Licenses & Copyright
+====================
+
+This license file adheres to the formatting guidelines of
+[readable-licenses](https://github.com/nevir/readable-licenses).
+
+
+Ribose's BSD 2-Clause License
+-----------------------------
+
+Copyright (c) 2024, [Ribose Inc](https://www.ribose.com).
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1.  Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+2.  Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.adoc

@@ -145,6 +145,8 @@ same class and all their attributes are equal.
 
 === Supported attribute value types
 
+==== General types
+
 Lutaml::Model supports the following attribute types, they can be
 referred by a string, a symbol, or their class constant.
 
@@ -166,12 +168,11 @@ attribute :name_of_attribute, {symbol | string | class}
 | `DateTime` | `:date_time` | `Lutaml::Model::Type::DateTime` | `::DateTime`
 | `TimeWithoutDate` | `:time_without_date` | `Lutaml::Model::Type::TimeWithoutDate` | `::Time`
 | `Boolean` | `:boolean` | `Lutaml::Model::Type::Boolean` | `Boolean`
-| `Decimal` | `:decimal` | `Lutaml::Model::Type::Decimal` | `::BigDecimal`
+| `Decimal` (optional) | `:decimal` | `Lutaml::Model::Type::Decimal` | `::BigDecimal`
 | `Hash` | `:hash` | `Lutaml::Model::Type::Hash` | `::Hash`
 
 |===
 
-
 .Defining attributes with supported types via symbol, string and class
 [example]
 ====
@@ -198,6 +199,23 @@ end
 ----
 ====
 
+==== (optional) Decimal type
+
+The `BigDecimal` class is no longer part of the standard Ruby library from Ruby
+3.4 onwards, hence the `Decimal` type is only enabled when the `bigdecimal`
+library is loaded.
+
+This means that the following code needs to be run before using (and parsing)
+the `Decimal` type:
+
+[source,ruby]
+----
+require 'bigdecimal'
+----
+
+If the `bigdecimal` library is not loaded, usage of the `Decimal` type will
+raise a `Lutaml::Model::TypeNotSupportedError`.
+
 
 === Attribute as a collection
 
@@ -989,7 +1007,7 @@ end
 
 TODO: How to create mixed content from `#new`?
 
-
+[[xml-schema-location]]
 ==== Automatic support of `xsi:schemaLocation`
 
 The
@@ -1444,9 +1462,14 @@ NOTE: The corresponding keyword used by Shale is `receiver:` instead of
 
 ==== Attribute serialization with custom methods
 
+===== General
+
 Define custom methods for specific attribute mappings using the `with:` key for
 each serialization mapping block for `from` and `to`.
 
+
+===== XML serialization with custom methods
+
 Syntax:
 
 .XML serialization with custom methods
@@ -1468,6 +1491,81 @@ xml do
 end
 ----
 
+.Using the `with:` key to define custom serialization methods for XML
+[example]
+====
+The following class will parse the XML snippet below:
+
+[source,ruby]
+----
+class CustomCeramic < Lutaml::Model::Serializable
+  attribute :name, :string
+  attribute :size, :integer
+  attribute :description, :string
+
+  xml do
+    map_element "Name", to: :name, with: { to: :name_to_xml, from: :name_from_xml }
+    map_attribute "Size", to: :size, with: { to: :size_to_xml, from: :size_from_xml }
+    map_content with: { to: :description_to_xml, from: :description_from_xml }
+  end
+
+  def name_to_xml(model, parent, doc)
+    el = doc.create_element("Name")
+    doc.add_text(el, "XML Masterpiece: #{model.name}")
+    doc.add_element(parent, el)
+  end
+
+  def name_from_xml(model, value)
+    model.name = value.sub(/^XML Masterpiece: /, "")
+  end
+
+  def size_to_xml(model, parent, doc)
+    doc.add_attribute(parent, "Size", model.size + 3)
+  end
+
+  def size_from_xml(model, value)
+    model.size = value.to_i - 3
+  end
+
+  def description_to_xml(model, parent, doc)
+    doc.add_text(parent, "XML Description: #{model.description}")
+  end
+
+  def description_from_xml(model, value)
+    model.description = value.join.strip.sub(/^XML Description: /, "")
+  end
+end
+----
+
+[source,xml]
+----
+<CustomCeramic Size="15">
+  <Name>XML Masterpiece: Vase</Name>
+  XML Description: A beautiful ceramic vase
+</CustomCeramic>
+----
+
+[source,ruby]
+----
+> CustomCeramic.from_xml(xml)
+> #<CustomCeramic:0x0000000108d0e1f8
+   @element_order=["text", "Name", "text", "Size", "text"],
+   @name="Masterpiece: Vase",
+   @ordered=nil,
+   @size=12,
+   @description="A beautiful ceramic vase",
+   @validate_on_set=false>
+> puts CustomCeramic.new(name: "Vase", size: 12, description: "A beautiful vase").to_xml
+# <CustomCeramic Size="15">
+#   <Name>XML Masterpiece: Vase</Name>
+#   XML Description: A beautiful vase
+# </CustomCeramic>
+----
+====
+
+
+===== Key-value data model serialization with custom methods
+
 .Key-value data model serialization with custom methods
 [source,ruby]
 ----
@@ -1524,7 +1622,7 @@ end
 
 
 [[attribute-extraction]]
-==== Attribute extraction
+==== Attribute extraction (for key-value data models only)
 
 NOTE: This feature is for key-value data model serialization only.
 
@@ -1992,9 +2090,9 @@ differences in implementation.
 |
 
 | Value types
-| `Lutaml::Model::Type` includes: `Integer`, `String`, `Float`, `Boolean`, `Date`, `DateTime`, `Time`, `Hash`.
+| `Lutaml::Model::Type` includes: `Integer`, `String`, `Float`, `Boolean`, `Date`, `DateTime`, `Time`, `Decimal`, `Hash`.
 | `Shale::Type` includes: `Integer`, `String`, `Float`, `Boolean`, `Date`, `Time`.
-| Lutaml::Model supports the additional value types `DateTime` and `Hash`.
+| Lutaml::Model supports additional value types `Decimal`, `DateTime` and `Hash`.
 
 | Configuration
 | `Lutaml::Model::Config`
@@ -2011,6 +2109,11 @@ differences in implementation.
 | XML, YAML, JSON, TOML, CSV
 | Lutaml::Model does not support CSV.
 
+| Validation
+| Supports collection range, fixed values, and custom validation
+| Requires implementation
+|
+
 | Adapter support
 | XML (Nokogiri, Ox, Oga), YAML, JSON (JSON, MultiJson), TOML (Toml-rb, Tomlib)
 | XML (Nokogiri, Ox), YAML, JSON (JSON, MultiJson), TOML (Toml-rb, Tomlib), CSV
@@ -2042,6 +2145,12 @@ namespace from the root element.
 | No.
 |
 
+| Support for `xsi:schemaLocation`
+| Yes. Automatically supports the <<xml-schema-location,`xsi:schemaLocation`>>
+attribute for every element.
+| Requires manual specification on every XML element that uses it.
+|
+
 4+h| Attribute features
 
 | Attribute delegation
@@ -2061,7 +2170,6 @@ data models.
 | No.
 | Lutaml::Model supports attribute extraction from key-value data models.
 
-
 |===
 
 
@@ -2114,25 +2222,26 @@ Actions:
 
 === Step 2: Replace value type definitions
 
-Value types in `Lutaml::Model` are under the `Lutaml::Model::Type` module.
+Value types in `Lutaml::Model` are under the `Lutaml::Model::Type` module,
+or use the LutaML type symbols.
 
 [source,ruby]
 ----
 class Example < Lutaml::Model::Serializable
-  attribute :length, Lutaml::Model::Type::Integer
-  attribute :description, Lutaml::Model::Type::String
+  attribute :length, :integer
+  attribute :description, :string
 end
 ----
 
 [NOTE]
 ====
-`Lutaml::Model` also supports specifying predefined value types as strings or
+`Lutaml::Model` supports specifying predefined value types as strings or
 symbols, which is not supported by Shale.
 
 [source,ruby]
 ----
 class Example < Lutaml::Model::Serializable
-  attribute :length, :integer
+  attribute :length, Lutaml::Model::Type::Integer
   attribute :description, "String"
 end
 ----
@@ -2369,6 +2478,6 @@ allowing you to shape and structure your data into useful forms.
 == License and Copyright
 
 This project is licensed under the BSD 2-clause License.
-See the LICENSE file for details.
+See the link:LICENSE.md[] file for details.
 
 Copyright Ribose.

data/lib/lutaml/model/attribute.rb

@@ -27,6 +27,16 @@ module Lutaml
         raise ArgumentError, "Unknown Lutaml::Model::Type: #{type}"
       end
 
+      def cast_value(value)
+        return type.cast(value) unless value.is_a?(Array)
+
+        value.map { |v| type.cast(v) }
+      end
+
+      def setter
+        :"#{@name}="
+      end
+
       def collection?
         options[:collection] || false
       end
@@ -36,9 +46,13 @@ module Lutaml
       end
 
       def default
-        return options[:default].call if options[:default].is_a?(Proc)
+        value = if options[:default].is_a?(Proc)
+                  options[:default].call
+                else
+                  options[:default]
+                end
 
-        options[:default]
+        cast_value(value)
       end
 
       def render_nil?

data/lib/lutaml/model/error/incorrect_mapping_argument_error.rb

@@ -0,0 +1,6 @@
+module Lutaml
+  module Model
+    class IncorrectMappingArgumentsError < Error
+    end
+  end
+end

data/lib/lutaml/model/error/type_not_enabled_error.rb

@@ -0,0 +1,9 @@
+module Lutaml
+  module Model
+    class TypeNotEnabledError < Error
+      def initialize(type_name, value)
+        super("#{type_name} type is not enabled. Value: #{value}")
+      end
+    end
+  end
+end

data/lib/lutaml/model/error.rb

@@ -6,6 +6,8 @@ module Lutaml
 end
 
 require_relative "error/invalid_value_error"
+require_relative "error/incorrect_mapping_argument_error"
 require_relative "error/unknown_adapter_type_error"
 require_relative "error/collection_count_out_of_range_error"
 require_relative "error/validation_error"
+require_relative "error/type_not_enabled_error"

data/lib/lutaml/model/json_adapter/standard_json_adapter.rb

@@ -6,8 +6,7 @@ module Lutaml
     module JsonAdapter
       class StandardJsonAdapter < JsonDocument
         def self.parse(json)
-          attributes = JSON.parse(json, create_additions: false)
-          new(attributes)
+          JSON.parse(json, create_additions: false)
         end
 
         def to_json(*args)

data/lib/lutaml/model/key_value_mapping.rb

@@ -11,12 +11,14 @@ module Lutaml
 
       def map(
         name,
-        to:,
+        to: nil,
         render_nil: false,
         with: {},
         delegate: nil,
         child_mappings: nil
       )
+        validate!(name, to, with)
+
         @mappings << KeyValueMappingRule.new(
           name,
           to: to,
@@ -28,6 +30,18 @@ module Lutaml
       end
 
       alias map_element map
+
+      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
     end
   end
 end

data/lib/lutaml/model/mapping_hash.rb

@@ -24,6 +24,20 @@ module Lutaml
         @ordered
       end
 
+      def method_missing(method_name, *args)
+        value = self[method_name] || self[method_name.to_s]
+        return value if value
+
+        super
+      end
+
+      def respond_to_missing?(method_name, include_private = false)
+        key_present = key?(method_name) || key?(method_name.to_s)
+        return true if key_present
+
+        super
+      end
+
       private
 
       def normalize(key)

data/lib/lutaml/model/mapping_rule.rb

@@ -17,6 +17,7 @@ module Lutaml
         delegate: nil,
         mixed_content: false,
         namespace_set: false,
+        prefix_set: false,
         child_mappings: nil
       )
         @name = name
@@ -26,6 +27,7 @@ module Lutaml
         @delegate = delegate
         @mixed_content = mixed_content
         @namespace_set = namespace_set
+        @prefix_set = prefix_set
         @child_mappings = child_mappings
       end
 
@@ -40,25 +42,47 @@ module Lutaml
         end
       end
 
-      def serialize(model, value)
+      def serialize_attribute(model, element, doc)
         if custom_methods[:to]
-          model.send(custom_methods[:to], model, value)
+          model.send(custom_methods[:to], model, element, doc)
+        end
+      end
+
+      def serialize(model, parent = nil, doc = nil)
+        if custom_methods[:to]
+          model.send(custom_methods[:to], model, parent, doc)
+        elsif delegate
+          model.public_send(delegate).public_send(to)
         else
-          value
+          model.public_send(to)
         end
       end
 
-      def deserialize(model, doc)
+      def deserialize(model, value, attributes, mapper_class = nil)
         if custom_methods[:from]
-          model.send(custom_methods[:from], model, doc)
+          mapper_class.new.send(custom_methods[:from], model, value)
+        elsif delegate
+          if model.public_send(delegate).nil?
+            model.public_send(:"#{delegate}=", attributes[delegate].type.new)
+          end
+
+          model.public_send(delegate).public_send(:"#{to}=", value)
         else
-          doc[name.to_s]
+          model.public_send(:"#{to}=", value)
         end
       end
 
       def namespace_set?
         @namespace_set
       end
+
+      def prefix_set?
+        @prefix_set
+      end
+
+      def content_mapping?
+        name.nil?
+      end
     end
   end
 end