lutaml-model 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 073512f7cfe8a5d5bb7af56cf3c1804e0eb9942f9fe2e3f7e0dcc3b0b9fd879a
-  data.tar.gz: '00916ad5bc08547bd350f59be3c554700cd73c1b5af09e2ce7175f39d3443e45'
+  metadata.gz: 518cf7f42227fbdd75f25ed97d2107f0d0c575290ae2a21d5be323b70546cae4
+  data.tar.gz: 19f355abc4da8bff1ce95b06eba36aca987888325175aba9ab153998bcc8d68f
 SHA512:
-  metadata.gz: '0196826861701d9277a81f5e0c52fd0bfdac8859128eddb82aee55c074a3688bc453f89ff40f54f8a40a639d5ac625d18e6f097c4abb88f7ee11294b7594e1ff'
-  data.tar.gz: 50fb93a7b534ae371ebecc62576633027a9cc945ed333cdbc7aa3c32a993a558b196dde0513aa594796cfb442c2837158c9181a101351933778009e4e5a00a05
+  metadata.gz: 9fb8b93ce570cc804f4f9d2f1562ac58dab5b76aa55b5d3b79d82a95eef6edc4c65752beeb7d6176878d4f765dbf40a3f63331b8b2b726363b7a5a506046d243
+  data.tar.gz: 10a50c4c30cf2034d3e394fd8526d00c220df5dcf216d8dd5fc19395858766254d8e8f835232404be2661d5821ebb05e82afad130b238d27aa224d5fc38855cd

data/lib/lutaml/model/collection.rb

@@ -4,6 +4,24 @@ module Lutaml
       include Enumerable
 
       class << self
+        INHERITED_ATTRIBUTES = %i[
+          instance_type
+          instance_name
+          order_by_field
+          order_direction
+        ].freeze
+
+        def inherited(subclass)
+          super
+
+          INHERITED_ATTRIBUTES.each do |var|
+            subclass.instance_variable_set(
+              :"@#{var}",
+              instance_variable_get(:"@#{var}"),
+            )
+          end
+        end
+
         attr_reader :instance_type,
                     :instance_name,
                     :order_by_field,
@@ -96,14 +114,13 @@ module Lutaml
         items = [items].compact unless items.is_a?(Array)
 
         register_object = Lutaml::Model::GlobalRegister.lookup(@__register)
-        type = register_object.get_class_without_register(self.class.instance_type)
+        type = register_object.get_class(self.class.instance_type)
         self.collection = items.map do |item|
           if item.is_a?(type)
             item
           elsif type <= Lutaml::Model::Type::Value
             type.cast(item)
           else
-            item[:__register] = __register
             type.new(item)
           end
         end

data/lib/lutaml/model/mapping/key_value_mapping.rb

@@ -4,11 +4,11 @@ require_relative "key_value_mapping_rule"
 module Lutaml
   module Model
     class KeyValueMapping < Mapping
-      attr_reader :mappings, :format, :key_mappings, :value_mappings
+      attr_reader :format, :key_mappings, :value_mappings
 
       def initialize(format = nil)
         super()
-
+        @mappings = {}
         @format = format
       end
 
@@ -49,7 +49,7 @@ module Lutaml
         mapping_name = name_for_mapping(root_mappings, name)
         validate!(mapping_name, to, with, render_nil, render_empty)
 
-        @mappings << KeyValueMappingRule.new(
+        @mappings[mapping_name] = KeyValueMappingRule.new(
           mapping_name,
           to: to,
           render_nil: render_nil,
@@ -80,7 +80,7 @@ module Lutaml
       )
         @raw_mapping = true
         validate!(Constants::RAW_MAPPING_KEY, to, with, render_nil, nil)
-        @mappings << KeyValueMappingRule.new(
+        @mappings[Constants::RAW_MAPPING_KEY] = KeyValueMappingRule.new(
           Constants::RAW_MAPPING_KEY,
           to: to,
           render_nil: render_nil,
@@ -131,6 +131,14 @@ module Lutaml
         name
       end
 
+      def mappings
+        @mappings.values
+      end
+
+      def mappings_hash
+        @mappings
+      end
+
       def validate!(key, to, with, render_nil, render_empty)
         validate_mappings!(key)
         validate_to_and_with_arguments!(key, to, with)
@@ -178,7 +186,7 @@ module Lutaml
 
       def validate_mappings!(_type)
         if (@raw_mapping && Utils.present?(@mappings)) ||
-            (!@raw_mapping && @mappings.any?(&:raw_mapping?))
+            (!@raw_mapping && mappings.any?(&:raw_mapping?))
           raise StandardError, "map_all is not allowed with other mappings"
         end
       end
@@ -190,11 +198,11 @@ module Lutaml
       end
 
       def duplicate_mappings
-        @mappings.map(&:deep_dup)
+        Utils.deep_dup(@mappings)
       end
 
       def find_by_to(to)
-        @mappings.find { |m| m.to.to_s == to.to_s }
+        mappings.find { |m| m.to.to_s == to.to_s }
       end
 
       def find_by_name(name)
@@ -202,11 +210,11 @@ module Lutaml
       end
 
       def polymorphic_mapping
-        @mappings.find(&:polymorphic_mapping?)
+        mappings.find(&:polymorphic_mapping?)
       end
 
       def root_mapping
-        @mappings.find(&:root_mapping?)
+        mappings.find(&:root_mapping?)
       end
 
       Lutaml::Model::Config::KEY_VALUE_FORMATS.each do |format|

data/lib/lutaml/model/mapping/key_value_mapping_rule.rb

@@ -64,6 +64,7 @@ module Lutaml
           with: Utils.deep_dup(custom_methods),
           delegate: delegate,
           child_mappings: Utils.deep_dup(child_mappings),
+          root_mappings: Utils.deep_dup(root_mappings),
           value_map: Utils.deep_dup(@value_map),
         )
       end

data/lib/lutaml/model/register.rb

@@ -28,7 +28,7 @@ module Lutaml
       def get_class(klass_name)
         expected_class = get_class_without_register(klass_name)
         if !(expected_class < Lutaml::Model::Type::Value)
-          expected_class.class_variable_set(:@@register, id)
+          expected_class.class_variable_set(:@@__register, id)
         end
         expected_class
       end

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

@@ -5,8 +5,8 @@ module Lutaml
     module Schema
       module SharedMethods
         def extract_register_from(klass)
-          register = if klass.class_variable_defined?(:@@register)
-                       klass.class_variable_get(:@@register)
+          register = if klass.class_variable_defined?(:@@__register)
+                       klass.class_variable_get(:@@__register)
                      end
 
           case register

data/lib/lutaml/model/serialize.rb

@@ -211,14 +211,14 @@ module Lutaml
               @mappings[format].merge_mapping_elements(mapping)
               @mappings[format].merge_elements_sequence(mapping)
             else
-              @mappings[format].mappings.concat(mapping.mappings)
+              @mappings[format].mappings_hash.merge!(mapping.mappings_hash)
             end
           end
         end
 
         def handle_key_value_mappings(mapping, format)
           @mappings[format] ||= KeyValueMapping.new
-          @mappings[format].mappings.concat(mapping.mappings)
+          @mappings[format].mappings_hash.merge!(mapping.mappings_hash)
         end
 
         def import_model(model)
@@ -497,8 +497,8 @@ module Lutaml
         def extract_register_id(register)
           if register
             register.is_a?(Lutaml::Model::Register) ? register.id : register
-          elsif class_variable_defined?(:@@register)
-            class_variable_get(:@@register)
+          elsif class_variable_defined?(:@@__register)
+            class_variable_get(:@@__register)
           else
             Lutaml::Model::Config.default_register
           end

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.7.6"
+    VERSION = "0.7.7"
   end
 end

data/spec/lutaml/model/xml/root_mappings/nested_child_mappings_spec.rb

@@ -47,6 +47,10 @@ module NestedChildMappingsSpec
       }
     end
   end
+
+  class ManifestResponseWrap < ManifestResponse
+    # This class confirms the successful inhertiance of the `Collection` attribute.
+  end
 end
 
 RSpec.describe "NestedChildMappingsSpec" do
@@ -90,10 +94,54 @@ RSpec.describe "NestedChildMappingsSpec" do
     YAML
   end
 
+  let(:wrapped_yaml) do
+    <<~YAML
+      ---
+      Yu Gothic:
+        Bold:
+          full_name: Yu Gothic Bold
+          paths:
+          - "/Applications/Microsoft Excel.app/Contents/Resources/DFonts/YuGothB.ttc"
+          - "/Applications/Microsoft OneNote.app/Contents/Resources/DFonts/YuGothB.ttc"
+          - "/Applications/Microsoft Outlook.app/Contents/Resources/DFonts/YuGothB.ttc"
+          - "/Applications/Microsoft PowerPoint.app/Contents/Resources/DFonts/YuGothB.ttc"
+          - "/Applications/Microsoft Word.app/Contents/Resources/DFonts/YuGothB.ttc"
+        Regular:
+          full_name: Yu Gothic Regular
+          paths:
+          - "/Applications/Microsoft Excel.app/Contents/Resources/DFonts/YuGothR.ttc"
+          - "/Applications/Microsoft OneNote.app/Contents/Resources/DFonts/YuGothR.ttc"
+          - "/Applications/Microsoft Outlook.app/Contents/Resources/DFonts/YuGothR.ttc"
+          - "/Applications/Microsoft PowerPoint.app/Contents/Resources/DFonts/YuGothR.ttc"
+          - "/Applications/Microsoft Word.app/Contents/Resources/DFonts/YuGothR.ttc"
+      Noto Sans Condensed:
+        Regular:
+          full_name: Noto Sans Condensed
+          paths:
+          - "/Users/foo/.fontist/fonts/NotoSans-Condensed.ttf"
+        Bold:
+          full_name: Noto Sans Condensed Bold
+          paths:
+          - "/Users/foo/.fontist/fonts/NotoSans-CondensedBold.ttf"
+        Bold Italic:
+          full_name: Noto Sans Condensed Bold Italic
+          paths:
+          - "/Users/foo/.fontist/fonts/NotoSans-CondensedBoldItalic.ttf"
+        Italic:
+          full_name: Noto Sans Condensed Italic
+          paths:
+          - "/Users/foo/.fontist/fonts/NotoSans-CondensedItalic.ttf"
+    YAML
+  end
+
   let(:parsed_yaml) do
     NestedChildMappingsSpec::ManifestResponse.from_yaml(yaml)
   end
 
+  let(:wrap_parsed_yaml) do
+    NestedChildMappingsSpec::ManifestResponseWrap.from_yaml(wrapped_yaml)
+  end
+
   let(:expected_fonts) do
     NestedChildMappingsSpec::ManifestResponse.new(
       [
@@ -161,4 +209,9 @@ RSpec.describe "NestedChildMappingsSpec" do
     expected_yaml = parsed_yaml.to_yaml
     expect(expected_yaml).to eq(yaml)
   end
+
+  it "round trips nested child mappings correctly with Wrap class" do
+    expected_yaml = wrap_parsed_yaml.to_yaml
+    expect(expected_yaml).to eq(yaml)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Ribose Inc.