lutaml 0.9.31 → 0.9.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fc853b658b666aa94375fab16effb961a032b3ef82bdc30b4c71945d8ed883c
-  data.tar.gz: 9e7dd6cbcbb7376b2232ef014d5171e68716e3702882bc3316afc6b0e5b9e987
+  metadata.gz: 1a3e7ce554e5b58c9d922d7588087550e9fed056f5492e822b15531d91ddcb14
+  data.tar.gz: 18ee2a6d41c7056f56cbb8f869ca234e3fcff6688024f8aeff55797047069270
 SHA512:
-  metadata.gz: c391071810d334c0bbf7e01b1680e5e7a3a425093df24fff2d52c45d05e6ad29fc69a2052d48192385e62918a38d33306f37e7f1376dcffbb1eb66affba82448
-  data.tar.gz: 85aa4dfb062d83cbf8febca8e24cc912d43f29beaa690b4a1aa666de460320b04065a0d7332a1bb94a56c8480cb4602da29db7cb14c3780e49d9781c8a4067d2
+  metadata.gz: eb8d3699fc5cdda40ae70b388e520095874828d80d5759c32f754df0aff1ec31ae185f17296e26d09e23bb41c8326fb517626389227c277f549f6a107d303c17
+  data.tar.gz: 745883a9eea0ef04d31f6941121d15dc9b0a687ae9c55634bd6790ab5d12fd1e72e6b9ce8b128a992463c405b057de53db76d0d0518a412f673986a4928288b0

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.31".freeze
+  VERSION = "0.9.33".freeze
 end

data/lib/lutaml/xmi/liquid_drops/attribute_drop.rb

@@ -9,7 +9,7 @@ module Lutaml
         @model = model
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
 
         uml_type = @model.uml_type
         @uml_type_idref = uml_type.idref if uml_type

data/lib/lutaml/xmi/liquid_drops/data_type_drop.rb

@@ -9,7 +9,7 @@ module Lutaml
         @model = model
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
 
         @owned_attributes = model&.owned_attribute&.select do |attr|
           attr.type?("uml:Property")

data/lib/lutaml/xmi/liquid_drops/diagram_drop.rb

@@ -9,7 +9,7 @@ module Lutaml
         @model = model
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
       end
 
       def xmi_id

data/lib/lutaml/xmi/liquid_drops/enum_drop.rb

@@ -9,7 +9,7 @@ module Lutaml
         @model = model
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
 
         @owned_literals = model&.owned_literal&.select do |owned_literal|
           owned_literal.type? "uml:EnumerationLiteral"

data/lib/lutaml/xmi/liquid_drops/enum_owned_literal_drop.rb

@@ -9,7 +9,7 @@ module Lutaml
         @model = model
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
       end
 
       def name

data/lib/lutaml/xmi/liquid_drops/generalization_drop.rb

@@ -13,7 +13,7 @@ module Lutaml
         @guidance = guidance
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
       end
 
       def id

data/lib/lutaml/xmi/liquid_drops/klass_drop.rb

@@ -10,7 +10,7 @@ module Lutaml
         @guidance = guidance
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
 
         @package = model&.packaged_element&.find do |e|
           e.type?("uml:Package")

data/lib/lutaml/xmi/liquid_drops/operation_drop.rb

@@ -9,7 +9,7 @@ module Lutaml
         @model = model
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
       end
 
       def id

data/lib/lutaml/xmi/liquid_drops/package_drop.rb

@@ -11,7 +11,7 @@ module Lutaml
 
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
 
         @packages = model.packaged_element.select do |e|
           e.type?("uml:Package")

data/lib/lutaml/xmi/liquid_drops/root_drop.rb

@@ -8,7 +8,7 @@ module Lutaml
         @guidance = guidance
         @options = options
         @xmi_root_model = options[:xmi_root_model]
-        @xmi_cache = options[:xmi_cache]
+        @id_name_mapping = options[:id_name_mapping]
 
         @options[:absolute_path] = "::#{model.name}"
 

data/lib/lutaml/xmi/parsers/xmi_base.rb

@@ -25,18 +25,15 @@ module Lutaml
         end
 
         # @param xmi_model [Lutaml::Model::Serializable]
-        def set_xmi_model(xmi_model, xmi_cache = nil)
-          @xmi_cache = xmi_cache ? xmi_cache : {}
-          @xmi_root_model = xmi_model
-          map_id_name(@xmi_cache, @xmi_root_model) if @xmi_cache.empty?
-        end
-
-        # @param yaml [String]
+        # @param id_name_mapping [Hash]
         # @return [Hash]
-        def get_guidance(yaml)
-          return unless yaml
+        def set_xmi_model(xmi_model, id_name_mapping = nil)
+          @id_name_mapping ||= id_name_mapping || {}
+          @xmi_root_model ||= xmi_model
 
-          YAML.safe_load(File.read(yaml, encoding: "UTF-8"))
+          if @id_name_mapping.empty?
+            map_id_name(@id_name_mapping, @xmi_root_model)
+          end
         end
 
         private
@@ -915,8 +912,8 @@ module Lutaml
         # @param xmi_id [String]
         # @return [String]
         def lookup_entity_name(xmi_id)
-          model_node_name_by_xmi_id(xmi_id) if @xmi_cache.empty?
-          @xmi_cache[xmi_id]
+          model_node_name_by_xmi_id(xmi_id) if @id_name_mapping.empty?
+          @id_name_mapping[xmi_id]
         end
 
         # @param xmi_id [String]
@@ -970,8 +967,8 @@ module Lutaml
         def model_node_name_by_xmi_id(xmi_id)
           id_name_mapping = Hash.new
           map_id_name(id_name_mapping, @xmi_root_model)
-          @xmi_cache = id_name_mapping
-          @xmi_cache[xmi_id]
+          @id_name_mapping = id_name_mapping
+          @id_name_mapping[xmi_id]
         end
 
         # @return [Array<Xmi::Uml::PackagedElement>]

data/lib/lutaml/xmi/parsers/xml.rb

@@ -11,10 +11,11 @@ module Lutaml
     module Parsers
       # Class for parsing .xmi schema files into ::Lutaml::Uml::Document
       class XML
-        @xmi_cache_static = {}
+        @id_name_mapping_static = {}
         @xmi_root_model_cache_static = {}
 
-        attr_reader :xmi_cache, :xmi_root_model, :all_packaged_elements_cache
+        attr_reader :id_name_mapping, :xmi_root_model,
+                    :all_packaged_elements_cache
 
         include XMIBase
 
@@ -42,38 +43,30 @@ module Lutaml
             new.serialize_xmi_to_liquid(xmi_model, guidance)
           end
 
-          # @param xml [String] path to xml
+          # @param xmi_path [String] path to xml
           # @param name [String]
           # @param guidance [String]
           # @return [Hash]
-          def serialize_generalization_by_name(xml, name, guidance = nil)
-            # puts "#{xml}, #{name}, #{guidance}"
-
+          def serialize_generalization_by_name( # rubocop:disable Metrics/MethodLength
+            xmi_path, name, guidance = nil
+          )
             # Load from cache or file
-            xml_cache_key = (Digest::SHA256.file xml).hexdigest
-            xmi_model = deep_clone(@xmi_root_model_cache_static[xml_cache_key])
-            xmi_model_to_cache = nil
-            if xmi_model == nil
-              xmi_model = get_xmi_model(xml)
-              xmi_model_to_cache = deep_clone(xmi_model)
-            end
-            xmi_cache = @xmi_cache_static[xml_cache_key]
+            xml_cache_key = (Digest::SHA256.file xmi_path).hexdigest
+            xmi_model = @xmi_root_model_cache_static[xml_cache_key] ||
+              get_xmi_model(xmi_path)
+            id_name_mapping = @id_name_mapping_static[xml_cache_key]
 
             instance = new
-            ret_val = instance.serialize_generalization_by_name(xmi_model, name, guidance, xmi_cache)
+            ret_val = instance.serialize_generalization_by_name(
+              xmi_model, name, guidance, id_name_mapping
+            )
 
-            # Put to cache
-            @xmi_cache_static[xml_cache_key] = instance.xmi_cache if guidance == nil
-            @xmi_root_model_cache_static[xml_cache_key] = xmi_model_to_cache if xmi_model_to_cache
+            # Put xmi_model and id_name_mapping to cache
+            @id_name_mapping_static[xml_cache_key] ||= instance.id_name_mapping
+            @xmi_root_model_cache_static[xml_cache_key] ||= xmi_model
 
             ret_val
           end
-
-          def deep_clone(obj)
-            # TODO: we need this if xmi_model is being modified in serialize_generalization_by_name
-            #Marshal.load(Marshal.dump(obj)) if obj != nil
-            obj
-          end
         end
 
         # @param xmi_model [Lutaml::Model::Serializable]
@@ -101,31 +94,31 @@ module Lutaml
         # @param xmi_model [Lutaml::Model::Serializable]
         # @param guidance_yaml [String]
         # return [Liquid::Drop]
-        def serialize_xmi_to_liquid(xmi_model, guidance_yaml = nil)
+        def serialize_xmi_to_liquid(xmi_model, guidance = nil)
           set_xmi_model(xmi_model)
           model = xmi_model.model
           options = {
             xmi_root_model: @xmi_root_model,
-            xmi_cache: @xmi_cache,
+            id_name_mapping: @id_name_mapping,
             with_gen: true,
             with_absolute_path: true,
           }
-          guidance = get_guidance(guidance_yaml)
           ::Lutaml::XMI::RootDrop.new(model, guidance, options)
         end
 
         # @param xmi_model [Lutaml::Model::Serializable]
         # @param name [String]
         # @param guidance_yaml [String]
+        # @param id_name_mapping [Hash]
         # @return [Hash]
-        def serialize_generalization_by_name(xmi_model, name, # rubocop:disable Metrics/MethodLength
-                                             guidance_yaml = nil, xmi_cache = nil)
-          set_xmi_model(xmi_model, xmi_cache)
+        def serialize_generalization_by_name( # rubocop:disable Metrics/MethodLength
+          xmi_model, name, guidance = nil, id_name_mapping = nil
+        )
+          set_xmi_model(xmi_model, id_name_mapping)
           klass = find_klass_packaged_element(name)
-          guidance = get_guidance(guidance_yaml)
           options = {
             xmi_root_model: @xmi_root_model,
-            xmi_cache: @xmi_cache,
+            id_name_mapping: @id_name_mapping,
             with_gen: true,
             with_absolute_path: true,
           }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.31
+  version: 0.9.33
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir