lutaml-model 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9883cb9431e9cd0c40c6e30891e1fb84861f1b9e9e7eb31a1cb5c6ec0d6121dc
-  data.tar.gz: 2d00bb121ca7486d151f4daaacb86f98824ef5950460dc4caecffe4280c93607
+  metadata.gz: 94d3957e15a5f50e2fc02c922f739acf71e99a592b97c4461c64b20cbc203bc5
+  data.tar.gz: 0daf15d9e99b94ecce154a95b86d8b24a11bc4ae89f7e21f44cd7d251ec11ab9
 SHA512:
-  metadata.gz: df269be2c13bb4586e13d99dc79b47dbe1b445d49b8f23adf9c7ef502dae58deb77dd714431d29991c56e9aa9ac422a03910648e6f9a81414c7f375541fa6bf4
-  data.tar.gz: ed384722ad8f1fdb81671c8318ae0190c7372780a910ffece79e50658103344bd9f293afce048afa728cc91e47d952f6812bdbf2bce7a18d652d6704f9ef69cd
+  metadata.gz: a05e07d0948529796da6833032c9edae933a022734f9018fc459a4caf7e8ee6d475e325b002a58c4b5de764fecde077380ab528bc0a60f87eecef8919dfa16f4
+  data.tar.gz: f6116e02319e52a64e6ed0817655b456ca0be1933f66fea70dab1999fbd4a1c2a70b52cfc60f153d1b18d6778b23882598c76ca7a4af0b7e7eb5eca0e563040c

data/.github/workflows/dependent-repos.json

@@ -8,8 +8,9 @@
     "metanorma/sts-ruby",
     "lutaml/metaschema",
     "glossarist/termium",
+    "glossarist/glossarist-ruby",
     "lutaml/oasis-etm",
     "lutaml/ali",
     "lutaml/reqif"
   ]
-}
+}

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-02-08 01:06:17 UTC using RuboCop version 1.71.2.
+# on 2025-02-13 10:44:38 UTC using RuboCop version 1.71.2.
 # 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
@@ -27,34 +27,21 @@ Layout/IndentationWidth:
   Exclude:
     - 'lib/lutaml/model/schema/xml_compiler.rb'
 
-# Offense count: 596
+# Offense count: 467
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 19
+# Offense count: 13
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
 Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'spec/benchmarks/xml_parsing_benchmark_spec.rb'
-    - 'spec/lutaml/model/schema/json_schema_spec.rb'
-    - 'spec/lutaml/model/schema/relaxng_schema_spec.rb'
-    - 'spec/lutaml/model/schema/xsd_schema_spec.rb'
-    - 'spec/lutaml/model/schema/yaml_schema_spec.rb'
-    - 'spec/lutaml/model/transformation_spec.rb'
-    - 'spec/lutaml/model/validation_spec.rb'
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
 
-# Offense count: 4
-Lint/DuplicateMethods:
-  Exclude:
-    - 'lib/lutaml/model/type/float.rb'
-    - 'lib/lutaml/model/xml_adapter/xml_document.rb'
-    - 'lib/lutaml/model/xml_adapter/xml_element.rb'
-
 # Offense count: 56
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
@@ -101,7 +88,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 87
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 46
+  Max: 45
 
 # Offense count: 8
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
@@ -131,16 +118,6 @@ Performance/MapCompact:
   Exclude:
     - 'lib/lutaml/model/serialize.rb'
 
-# Offense count: 8
-# Configuration parameters: Prefixes, AllowedPatterns.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Exclude:
-    - 'spec/lutaml/model/xml_adapter/oga_adapter_spec.rb'
-    - 'spec/lutaml/model/xml_adapter/ox_adapter_spec.rb'
-    - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
-    - 'spec/lutaml/model/xml_mapping_spec.rb'
-
 # Offense count: 2
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
@@ -161,80 +138,39 @@ RSpec/DescribedClass:
   Exclude:
     - 'spec/lutaml/model/xml_mapping_spec.rb'
 
-# Offense count: 169
+# Offense count: 152
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 54
 
-# Offense count: 2
-# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
-RSpec/IndexedLet:
-  Exclude:
-    - 'spec/address_spec.rb'
-
-# Offense count: 30
+# Offense count: 13
 RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/benchmarks/xml_parsing_benchmark_spec.rb'
-    - 'spec/lutaml/model/schema/json_schema_spec.rb'
-    - 'spec/lutaml/model/schema/relaxng_schema_spec.rb'
-    - 'spec/lutaml/model/schema/xsd_schema_spec.rb'
-    - 'spec/lutaml/model/schema/yaml_schema_spec.rb'
-    - 'spec/lutaml/model/transformation_spec.rb'
-    - 'spec/lutaml/model/validation_spec.rb'
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
 
-# Offense count: 4
-RSpec/MultipleDescribes:
-  Exclude:
-    - 'spec/lutaml/model/json_adapter_spec.rb'
-    - 'spec/lutaml/model/toml_adapter_spec.rb'
-    - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
-    - 'spec/lutaml/model/xml_adapter_spec.rb'
-
-# Offense count: 213
+# Offense count: 206
 RSpec/MultipleExpectations:
   Max: 14
 
-# Offense count: 30
+# Offense count: 29
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 9
 
-# Offense count: 108
+# Offense count: 109
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 4
 
-# Offense count: 9
+# Offense count: 8
 RSpec/PendingWithoutReason:
   Exclude:
     - 'spec/lutaml/model/type/date_time_spec.rb'
-    - 'spec/lutaml/model/type/integer_spec.rb'
     - 'spec/lutaml/model/type/time_spec.rb'
     - 'spec/lutaml/model/type/time_without_date_spec.rb'
     - 'spec/lutaml/model/validation_spec.rb'
 
-# Offense count: 1
-RSpec/RemoveConst:
-  Exclude:
-    - 'spec/lutaml/model/type_spec.rb'
-
-# Offense count: 3
-RSpec/RepeatedExample:
-  Exclude:
-    - 'spec/lutaml/model/key_value_mapping_spec.rb'
-
-# Offense count: 2
-RSpec/RepeatedExampleGroupBody:
-  Exclude:
-    - 'spec/lutaml/model/type/time_without_date_spec.rb'
-
-# Offense count: 2
-RSpec/RepeatedExampleGroupDescription:
-  Exclude:
-    - 'spec/lutaml/model/collection_spec.rb'
-
 # Offense count: 3
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
 # Include: **/*_spec.rb
@@ -245,12 +181,6 @@ RSpec/SpecFilePathFormat:
     - 'spec/lutaml/model/defaults_spec.rb'
     - 'spec/lutaml/model/type/decimal_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
-RSpec/VerifiedDoubles:
-  Exclude:
-    - 'spec/lutaml/model/type/hash_spec.rb'
-
 # Offense count: 1
 Security/CompoundHash:
   Exclude:

data/lib/lutaml/model/attribute.rb

@@ -248,13 +248,12 @@ module Lutaml
       end
 
       def cast(value, format, options = {})
-        value ||= [] if collection?
+        return value if type <= Serialize && value.is_a?(type.model)
 
+        value ||= [] if collection?
         if value.is_a?(Array)
-          value.map do |v|
-            cast(v, format, options)
-          end
-        elsif type <= Serialize && value.is_a?(Hash)
+          value.map { |v| cast(v, format, options) }
+        elsif type <= Serialize && castable?(value, format)
           type.apply_mappings(value, format, options)
         elsif !value.nil? && !value.is_a?(type)
           type.send(:"from_#{format}", value)
@@ -265,6 +264,11 @@ module Lutaml
 
       private
 
+      def castable?(value, format)
+        value.is_a?(Hash) ||
+          (format == :xml && value.is_a?(Lutaml::Model::XmlAdapter::XmlElement))
+      end
+
       def validate_options!(options)
         if (invalid_opts = options.keys - ALLOWED_OPTIONS).any?
           raise StandardError,

data/lib/lutaml/model/schema/xml_compiler.rb

@@ -611,7 +611,9 @@ module Lutaml
             when :attributes
               required_files_attribute(value)
             when :attribute_groups
-              value.each { |attribute_group| required_files_attribute_groups(attribute_group) }
+              value.each do |attribute_group|
+                required_files_attribute_groups(attribute_group)
+              end
             when :complex_content
               required_files_complex_content(value)
             when :simple_content

data/lib/lutaml/model/serialize.rb

@@ -493,8 +493,9 @@ module Lutaml
 
           raise Lutaml::Model::CollectionTrueMissingError(self, option[:caller_class]) if doc.is_a?(Array)
 
+          doc_order = doc.root.order
           if instance.respond_to?(:ordered=)
-            instance.element_order = doc.root.order
+            instance.element_order = doc_order
             instance.ordered = mappings_for(:xml).ordered? || options[:ordered]
             instance.mixed = mappings_for(:xml).mixed_content? || options[:mixed_content]
           end
@@ -512,7 +513,7 @@ module Lutaml
           end
 
           defaults_used = []
-          validate_sequence!(instance.element_order)
+          validate_sequence!(doc_order)
 
           mappings.each do |rule|
             raise "Attribute '#{rule.to}' not found in #{self}" unless valid_rule?(rule)
@@ -534,9 +535,7 @@ module Lutaml
             rule.deserialize(instance, value, attributes, self)
           end
 
-          defaults_used.each do |attribute_name|
-            instance.using_default_for(attribute_name)
-          end
+          defaults_used.each { |attr_name| instance.using_default_for(attr_name) }
 
           instance
         end
@@ -548,9 +547,8 @@ module Lutaml
             doc.root.find_attribute_value(rule_names)
           else
             attr = attribute_for_rule(rule)
-
             children = doc.children.select do |child|
-              rule_names.include?(child.namespaced_name)
+              rule_names.include?(child.namespaced_name) && !child.text?
             end
 
             if rule.using_custom_methods? || attr.type == Lutaml::Model::Type::Hash
@@ -570,7 +568,7 @@ module Lutaml
 
             values = children.map do |child|
               if !rule.using_custom_methods? && attr.type <= Serialize
-                attr.type.apply_xml_mapping(child, attr.type.new, options.except(:mappings))
+                attr.cast(child, :xml, options.except(:mappings))
               elsif attr.raw?
                 inner_xml_of(child)
               else

data/lib/lutaml/model/type/float.rb

@@ -27,10 +27,6 @@ module Lutaml
         def to_json(*_args)
           value
         end
-
-        def to_yaml
-          value
-        end
       end
     end
   end

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.6.0"
+    VERSION = "0.6.2"
   end
 end

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

@@ -23,10 +23,6 @@ module Lutaml
           @root.children
         end
 
-        def root
-          @root
-        end
-
         def attributes
           root.attributes
         end

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

@@ -6,10 +6,8 @@ module Lutaml
       class XmlElement
         attr_reader :attributes,
                     :children,
-                    :text,
                     :namespace_prefix,
-                    :parent_document,
-                    :default_namespace
+                    :parent_document
 
         attr_accessor :adapter_node
 

data/spec/address_spec.rb

@@ -3,7 +3,7 @@ require_relative "fixtures/address"
 require_relative "fixtures/person"
 
 RSpec.describe Address do
-  let(:person1) do
+  let(:tom_warren) do
     {
       first_name: "Tom",
       last_name: "Warren",
@@ -15,7 +15,7 @@ RSpec.describe Address do
       active: true,
     }
   end
-  let(:person2) do
+  let(:jack_warren) do
     {
       first_name: "Jack",
       last_name: "Warren",
@@ -31,7 +31,7 @@ RSpec.describe Address do
     {
       country: "USA",
       post_code: "01001",
-      person: [person1, person2],
+      person: [tom_warren, jack_warren],
     }
   end
   let(:address) { described_class.new(attributes) }

data/spec/benchmarks/xml_parsing_benchmark_spec.rb

@@ -61,9 +61,9 @@ RSpec.describe "LutaML Model Performance" do
     end
 
     thresholds = {
-      "Nokogiri Adapter" => 5,
-      "Ox Adapter" => 15,
-      "Oga Adapter" => 5,
+      "Nokogiri Adapter" => 4,
+      "Ox Adapter" => 10,
+      "Oga Adapter" => 4,
     }
 
     report.entries.each do |entry|

data/spec/lutaml/model/collection_spec.rb

@@ -186,22 +186,6 @@ RSpec.describe CollectionTests do
     end
   end
 
-  context "when collection counts are below given ranges" do
-    let(:invalid_attributes) do
-      attributes.merge(operators: [], sensors: [])
-    end
-
-    it "raises CollectionCountOutOfRangeError" do
-      kiln = CollectionTests::Kiln.new(invalid_attributes)
-      expect do
-        kiln.validate!
-      end.to raise_error(Lutaml::Model::ValidationError) do |error|
-        expect(error).to include(Lutaml::Model::CollectionCountOutOfRangeError)
-        expect(error.error_messages).to include(a_string_matching(/operators count is 0, must be at least 1/))
-      end
-    end
-  end
-
   context "when collection with unbounded maximum exceeds minimum" do
     let(:valid_attributes) do
       attributes.merge(operators: ["John", "Jane", "Jim", "Jessica"])

data/spec/lutaml/model/custom_model_spec.rb

@@ -5,13 +5,53 @@ class CustomModelChild
 end
 
 class CustomModelParent
-  attr_accessor :first_name, :middle_name, :last_name, :child_mapper
+  attr_accessor :first_name, :middle_name, :last_name, :child_mapper, :math
 
   def name
     "#{first_name} #{last_name}"
   end
 end
 
+class GenericFormulaClass
+  attr_accessor :value
+end
+
+class Mi < Lutaml::Model::Serializable
+  model GenericFormulaClass
+
+  attribute :value, :string
+
+  xml do
+    root "mi"
+
+    map_content to: :value
+  end
+end
+
+class Mstyle < Lutaml::Model::Serializable
+  model GenericFormulaClass
+
+  attribute :value, Mi, collection: true
+
+  xml do
+    root "mstyle"
+
+    map_element :mi, to: :value
+  end
+end
+
+class MmlMath < Lutaml::Model::Serializable
+  model GenericFormulaClass
+
+  attribute :value, Mstyle, collection: true
+
+  xml do
+    root "math"
+
+    map_element :mstyle, to: :value
+  end
+end
+
 class CustomModelChildMapper < Lutaml::Model::Serializable
   model CustomModelChild
 
@@ -31,6 +71,7 @@ class CustomModelParentMapper < Lutaml::Model::Serializable
   attribute :middle_name, Lutaml::Model::Type::String
   attribute :last_name, Lutaml::Model::Type::String
   attribute :child_mapper, CustomModelChildMapper
+  attribute :math, MmlMath
 
   xml do
     map_element :first_name, to: :first_name
@@ -38,6 +79,7 @@ class CustomModelParentMapper < Lutaml::Model::Serializable
     map_element :last_name, to: :last_name
     map_element :CustomModelChild,
                 with: { to: :child_to_xml, from: :child_from_xml }
+    map_element :math, to: :math
   end
 
   def child_to_xml(model, parent, doc)
@@ -317,6 +359,11 @@ RSpec.describe "CustomModel" do
             <street>Oxford Street</street>
             <city>London</city>
           </CustomModelChild>
+          <math>
+            <mstyle>
+              <mi>Math</mi>
+            </mstyle>
+          </math>
         </CustomModelParent>
       XML
     end
@@ -333,6 +380,7 @@ RSpec.describe "CustomModel" do
         expect(instance.child_mapper.class).to eq(child_model)
         expect(instance.child_mapper.street).to eq("Oxford Street")
         expect(instance.child_mapper.city).to eq("London")
+        expect(instance.math.value.first.value.first.value).to eq("Math")
       end
     end
 

data/spec/lutaml/model/json_adapter_spec.rb

@@ -3,35 +3,37 @@ require "lutaml/model/json_adapter/standard_json_adapter"
 require "lutaml/model/json_adapter/multi_json_adapter"
 require_relative "../../fixtures/sample_model"
 
-RSpec.shared_examples "a JSON adapter" do |adapter_class|
-  let(:attributes) { { name: "John Doe", age: 30 } }
-  let(:model) { SampleModel.new(attributes) }
+RSpec.describe "JsonAdapter" do
+  shared_examples "a JSON adapter" do |adapter_class|
+    let(:attributes) { { name: "John Doe", age: 30 } }
+    let(:model) { SampleModel.new(attributes) }
 
-  let(:expected_json) do
-    if adapter_class == Lutaml::Model::JsonAdapter::StandardJsonAdapter
-      JSON.generate(attributes)
-    elsif adapter_class == Lutaml::Model::JsonAdapter::MultiJsonAdapter
-      MultiJson.dump(attributes)
+    let(:expected_json) do
+      if adapter_class == Lutaml::Model::JsonAdapter::StandardJsonAdapter
+        JSON.generate(attributes)
+      elsif adapter_class == Lutaml::Model::JsonAdapter::MultiJsonAdapter
+        MultiJson.dump(attributes)
+      end
     end
-  end
 
-  it "serializes to JSON" do
-    json = adapter_class.new(attributes).to_json
-    expect(json).to eq(expected_json)
-  end
+    it "serializes to JSON" do
+      json = adapter_class.new(attributes).to_json
+      expect(json).to eq(expected_json)
+    end
 
-  it "deserializes from JSON" do
-    doc = adapter_class.parse(expected_json)
-    new_model = SampleModel.new(doc.to_h)
-    expect(new_model.name).to eq("John Doe")
-    expect(new_model.age).to eq(30)
+    it "deserializes from JSON" do
+      doc = adapter_class.parse(expected_json)
+      new_model = SampleModel.new(doc.to_h)
+      expect(new_model.name).to eq("John Doe")
+      expect(new_model.age).to eq(30)
+    end
   end
-end
 
-RSpec.describe Lutaml::Model::JsonAdapter::StandardJsonAdapter do
-  it_behaves_like "a JSON adapter", described_class
-end
+  describe Lutaml::Model::JsonAdapter::StandardJsonAdapter do
+    it_behaves_like "a JSON adapter", described_class
+  end
 
-RSpec.describe Lutaml::Model::JsonAdapter::MultiJsonAdapter do
-  it_behaves_like "a JSON adapter", described_class
+  describe Lutaml::Model::JsonAdapter::MultiJsonAdapter do
+    it_behaves_like "a JSON adapter", described_class
+  end
 end

data/spec/lutaml/model/key_value_mapping_spec.rb

@@ -92,19 +92,7 @@ RSpec.describe Lutaml::Model::KeyValueMapping do
       )
     end
 
-    it "handles JSON mapping" do
-      expect(mapping.mappings[0].render_nil).to be true
-      expect(mapping.mappings[0].delegate).to eq(:container)
-      expect(mapping.mappings[0].raw_mapping?).to be true
-    end
-
-    it "handles YAML mapping" do
-      expect(mapping.mappings[0].render_nil).to be true
-      expect(mapping.mappings[0].delegate).to eq(:container)
-      expect(mapping.mappings[0].raw_mapping?).to be true
-    end
-
-    it "handles TOML mapping" do
+    it "handles JSON, YAML, TOML mapping" do
       expect(mapping.mappings[0].render_nil).to be true
       expect(mapping.mappings[0].delegate).to eq(:container)
       expect(mapping.mappings[0].raw_mapping?).to be true

data/spec/lutaml/model/schema/json_schema_spec.rb

@@ -1,21 +1,21 @@
 require "spec_helper"
 require "lutaml/model/schema"
 
-RSpec.describe Lutaml::Model::Schema::JsonSchema do
-  module SchemaGeneration
-    class Glaze < Lutaml::Model::Serializable
-      attribute :color, Lutaml::Model::Type::String
-      attribute :finish, Lutaml::Model::Type::String
-    end
+module SchemaGeneration
+  class Glaze < Lutaml::Model::Serializable
+    attribute :color, Lutaml::Model::Type::String
+    attribute :finish, Lutaml::Model::Type::String
+  end
 
-    class Vase < Lutaml::Model::Serializable
-      attribute :height, Lutaml::Model::Type::Float
-      attribute :diameter, Lutaml::Model::Type::Float
-      attribute :glaze, Glaze
-      attribute :materials, Lutaml::Model::Type::String, collection: true
-    end
+  class Vase < Lutaml::Model::Serializable
+    attribute :height, Lutaml::Model::Type::Float
+    attribute :diameter, Lutaml::Model::Type::Float
+    attribute :glaze, Glaze
+    attribute :materials, Lutaml::Model::Type::String, collection: true
   end
+end
 
+RSpec.describe Lutaml::Model::Schema::JsonSchema do
   describe ".generate" do
     it "generates a JSON schema for nested Serialize objects" do
       schema = described_class.generate(SchemaGeneration::Vase,

data/spec/lutaml/model/schema/relaxng_schema_spec.rb

@@ -1,21 +1,21 @@
 require "spec_helper"
 require "lutaml/model/schema"
 
-RSpec.describe Lutaml::Model::Schema::RelaxngSchema do
-  module SchemaGeneration
-    class Glaze < Lutaml::Model::Serializable
-      attribute :color, Lutaml::Model::Type::String
-      attribute :finish, Lutaml::Model::Type::String
-    end
+module SchemaGeneration
+  class Glaze < Lutaml::Model::Serializable
+    attribute :color, Lutaml::Model::Type::String
+    attribute :finish, Lutaml::Model::Type::String
+  end
 
-    class Vase < Lutaml::Model::Serializable
-      attribute :height, Lutaml::Model::Type::Float
-      attribute :diameter, Lutaml::Model::Type::Float
-      attribute :glaze, Glaze
-      attribute :materials, Lutaml::Model::Type::String, collection: true
-    end
+  class Vase < Lutaml::Model::Serializable
+    attribute :height, Lutaml::Model::Type::Float
+    attribute :diameter, Lutaml::Model::Type::Float
+    attribute :glaze, Glaze
+    attribute :materials, Lutaml::Model::Type::String, collection: true
   end
+end
 
+RSpec.describe Lutaml::Model::Schema::RelaxngSchema do
   describe ".generate" do
     it "generates a RELAX NG schema for nested Serialize objects" do
       schema = described_class.generate(SchemaGeneration::Vase, pretty: true)