lutaml 0.9.29 → 0.9.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9906a661e00ac7afb79f61a10c4d73e07ee9103028aab33e7364d50e1e5a45c0
-  data.tar.gz: eebdee0a0418f2de61317e2f320f7fc15a1ab79eb32200bccce98c2dc3b55cfd
+  metadata.gz: 39d7e65a03deeb293f5b6aa57d9d8f64615819434019b29749f5c7e248b5c09a
+  data.tar.gz: f48e6f72ec7a41414100f1897bbb4e3c1032934a1614f8f60ffe3b18fef4e8d9
 SHA512:
-  metadata.gz: 07ad5d9a28f2e5dd7df6b836d810028f4bccfa194ae46dfa95a1d4f923e07707249a0b60f1e05ec80130fc4ecbb9ed626651a63599629deb4da23a68740631e8
-  data.tar.gz: 9da4230858d7876cdd83d2748020e4400d14245ab26623d1d18e15422e03a0c7fdaf447ed70328310efd0b396e662027d766c3b832d8a13513812fca6af8c798
+  metadata.gz: 5735a788f2d4d41734a81596c70ecb02d38c3009d22b4dcc2ee7458bf44dd6e054d65094d3f3f07730c3d972efa0f350a437ac3530bf958a7e221840178fe937
+  data.tar.gz: 77ffdd102919ea98f92e87e0851c66cc71d1ae0306c062473b19b52d33e4f048cf7b78a38595b0a1d131afe1b59d8694984910b663896ed1726a25f50f917b1c

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.29".freeze
+  VERSION = "0.9.30".freeze
 end

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

@@ -4,6 +4,7 @@ require "lutaml/uml/has_attributes"
 require "lutaml/uml/document"
 require "lutaml/xmi"
 require "xmi"
+require 'digest'
 
 module Lutaml
   module XMI
@@ -24,10 +25,10 @@ module Lutaml
         end
 
         # @param xmi_model [Lutaml::Model::Serializable]
-        def set_xmi_model(xmi_model)
-          @xmi_cache = {}
+        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)
+          map_id_name(@xmi_cache, @xmi_root_model) if @xmi_cache.empty?
         end
 
         # @param yaml [String]
@@ -280,19 +281,34 @@ module Lutaml
           ]
         end
 
+        # Build a cache for packaged elements by ID
+        def build_packaged_element_cache
+          @packaged_element_cache = all_packaged_elements.to_h { |e| [e.id, e] }
+        end
+
         # @param id [String]
         # @return [Lutaml::Model::Serializable]
         def find_packaged_element_by_id(id)
-          all_packaged_elements.find { |e| e.id == id }
+          build_packaged_element_cache unless @packaged_element_cache
+          @packaged_element_cache[id]
         end
 
         # @param id [String]
         # @return [Lutaml::Model::Serializable]
         def find_upper_level_packaged_element(klass_id)
-          upper_klass = all_packaged_elements.find do |e|
-            e.packaged_element.find { |pe| pe.id == klass_id }
+          build_upper_level_cache unless @upper_level_cache
+          @upper_level_cache[klass_id]
+        end
+
+        # Build cache once for all packaged elements
+        def build_upper_level_cache
+          @upper_level_cache = {}
+
+          all_packaged_elements.each do |e|
+            e.packaged_element.each do |pe|
+              @upper_level_cache[pe.id] = e.name
+            end
           end
-          upper_klass&.name
         end
 
         # @param path [String]
@@ -857,15 +873,20 @@ module Lutaml
         # @return [Lutaml::Model::Serializable]
         # @note xpath %(//attribute[@xmi:idref="#{xmi_id}"])
         def fetch_attribute_node(xmi_id)
-          attribute_node = nil
+          @attribute_cache ||= build_attribute_cache
+          @attribute_cache[xmi_id]
+        end
+
+        def build_attribute_cache
+          cache = {}
           @xmi_root_model.extension.elements.element.each do |e|
-            if e.attributes&.attribute
-              e.attributes.attribute.each do |a|
-                attribute_node = a if a.idref == xmi_id
-              end
+            next unless e.attributes&.attribute
+
+            e.attributes.attribute.each do |a|
+              cache[a.idref] = a  # Store in hash for quick lookup
             end
           end
-          attribute_node
+          cache
         end
 
         # @param xmi_id [String]
@@ -955,6 +976,8 @@ module Lutaml
 
         # @return [Array<Xmi::Uml::PackagedElement>]
         def all_packaged_elements
+          return @all_packaged_elements_cache if @all_packaged_elements_cache
+
           all_elements = []
           packaged_element_roots = @xmi_root_model.model.packaged_element +
             @xmi_root_model.extension.primitive_types.packaged_element +
@@ -964,6 +987,7 @@ module Lutaml
             select_all_packaged_elements(all_elements, e, nil)
           end
 
+          @all_packaged_elements_cache = all_elements
           all_elements
         end
 

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

@@ -11,7 +11,10 @@ module Lutaml
     module Parsers
       # Class for parsing .xmi schema files into ::Lutaml::Uml::Document
       class XML
-        attr_reader :xmi_cache, :xmi_root_model
+        @xmi_cache_static = {}
+        @xmi_root_model_cache_static = {}
+
+        attr_reader :xmi_cache, :xmi_root_model, :all_packaged_elements_cache
 
         include XMIBase
 
@@ -44,8 +47,32 @@ module Lutaml
           # @param guidance [String]
           # @return [Hash]
           def serialize_generalization_by_name(xml, name, guidance = nil)
-            xmi_model = get_xmi_model(xml)
-            new.serialize_generalization_by_name(xmi_model, name, guidance)
+            # puts "#{xml}, #{name}, #{guidance}"
+
+            # 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]
+
+            instance = new
+            ret_val = instance.serialize_generalization_by_name(xmi_model, name, guidance, xmi_cache)
+
+            # 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
+
+            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
 
@@ -92,8 +119,8 @@ module Lutaml
         # @param guidance_yaml [String]
         # @return [Hash]
         def serialize_generalization_by_name(xmi_model, name, # rubocop:disable Metrics/MethodLength
-                                             guidance_yaml = nil)
-          set_xmi_model(xmi_model)
+                                             guidance_yaml = nil, xmi_cache = nil)
+          set_xmi_model(xmi_model, xmi_cache)
           klass = find_klass_packaged_element(name)
           guidance = get_guidance(guidance_yaml)
           options = {

metadata

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