lutaml 0.9.32 → 0.9.34

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module XMI
+    class SourceTargetDrop < Liquid::Drop
+      include Parsers::XMIBase
+
+      def initialize(model, options = {}) # rubocop:disable Lint/MissingSuper
+        @model = model
+        @options = options
+        @xmi_root_model = options[:xmi_root_model]
+        @id_name_mapping = options[:id_name_mapping]
+      end
+
+      def idref
+        @model.idref
+      end
+
+      def name
+        @model&.role&.name
+      end
+
+      def type
+        @model&.model&.name
+      end
+
+      def documentation
+        @model&.documentation&.value
+      end
+
+      def multiplicity
+        @model&.type&.multiplicity
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ require "lutaml/uml/has_attributes"
 require "lutaml/uml/document"
 require "lutaml/xmi"
 require "xmi"
-require 'digest'
+require "digest"
 
 module Lutaml
   module XMI
@@ -25,10 +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?
+        # @param id_name_mapping [Hash]
+        # @return [Hash]
+        def set_xmi_model(xmi_model, id_name_mapping = nil)
+          @id_name_mapping ||= id_name_mapping || {}
+          @xmi_root_model ||= xmi_model
+
+          if @id_name_mapping.empty?
+            map_id_name(@id_name_mapping, @xmi_root_model)
+          end
         end
 
         private
@@ -107,7 +112,7 @@ module Lutaml
           return package.name unless package.name.nil?
 
           connector = fetch_connector(package.id)
-          if connector.target&.model && connector.target.model&.name
+          if connector.target&.model&.name
             return "#{connector.target.model.name} " \
                    "(#{package.type.split(':').last})"
           end
@@ -307,7 +312,7 @@ module Lutaml
         # @return [Lutaml::Model::Serializable]
         def find_klass_packaged_element(path)
           lutaml_path = Lutaml::Path.parse(path)
-          if lutaml_path.segments.count == 1
+          if lutaml_path.segments.one?
             return find_klass_packaged_element_by_name(path)
           end
 
@@ -519,7 +524,13 @@ module Lutaml
         #   %(//connector[@xmi:idref="#{link_id}"]/#{node_name}/documentation)
         def fetch_definition_node_value(link_id, node_name)
           connector_node = fetch_connector(link_id)
-          connector_node.send(node_name.to_sym).documentation
+          documentation = connector_node.send(node_name.to_sym).documentation
+
+          if documentation.is_a?(Xmi::Sparx::SparxElementDocumentation)
+            documentation&.value
+          else
+            documentation
+          end
         end
 
         # @param klass [Lutaml::Model::Serializable]
@@ -637,7 +648,7 @@ module Lutaml
         # @param link [Lutaml::Model::Serializable]
         # @param link_member_name [String]
         # @return [Array<String, String, Hash, String, String>]
-        def serialize_member_type(owner_xmi_id, link, link_member_name)
+        def serialize_member_type(owner_xmi_id, link, link_member_name) # rubocop:disable Metrics/MethodLength
           member_end, xmi_id = serialize_member_end(owner_xmi_id, link)
 
           if link.name == "Association"
@@ -649,16 +660,26 @@ module Lutaml
               fetch_owned_attribute_node(xmi_id)
           end
 
+          if fetch_connector_name(link.id)
+            member_end = fetch_connector_name(link.id)
+          end
+
           [member_end, "aggregation", member_end_cardinality,
            member_end_attribute_name, xmi_id]
         end
 
+        def fetch_connector_name(link_id)
+          connector = fetch_connector(link_id)
+          connector&.name
+        end
+
         # @param link_id [String]
         # @param connector_type [String]
         # @return [Array<Hash, String>]
         # @note xpath %(//connector[@xmi:idref="#{link_id}"]/#{connector_type})
-        def fetch_assoc_connector(link_id, connector_type) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-          assoc_connector = fetch_connector(link_id).send(connector_type.to_sym)
+        def fetch_assoc_connector(link_id, connector_type) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+          connector = fetch_connector(link_id)
+          assoc_connector = connector.send(connector_type.to_sym)
 
           if assoc_connector
             assoc_connector_type = assoc_connector.type
@@ -667,9 +688,8 @@ module Lutaml
               cardinality.unshift("1") if cardinality.length == 1
               min, max = cardinality
             end
+
             assoc_connector_role = assoc_connector.role
-            # Does role has name attribute? Or get name from model?
-            # attribute_name = assoc_connector_role.name if assoc_connector_role
             attribute_name = assoc_connector.model.name if assoc_connector_role
             cardinality = cardinality_min_max_value(min, max)
           end
@@ -875,7 +895,7 @@ module Lutaml
             next unless e.attributes&.attribute
 
             e.attributes.attribute.each do |a|
-              cache[a.idref] = a  # Store in hash for quick lookup
+              cache[a.idref] = a # Store in hash for quick lookup
             end
           end
           cache
@@ -907,8 +927,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]
@@ -923,8 +943,10 @@ module Lutaml
         # @param xmi_id [String]
         # @param source_or_target [String]
         # @return [String]
-        def connector_name_by_source_or_target(xmi_id, source_or_target)
+        def connector_name_by_source_or_target(xmi_id, source_or_target) # rubocop:disable Metrics/AbcSize
           node = connector_node_by_id(xmi_id, source_or_target)
+          return node.name if node&.name
+
           return if node.nil? ||
             node.send(source_or_target.to_sym).nil? ||
             node.send(source_or_target.to_sym).model.nil?
@@ -962,8 +984,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]
@@ -106,7 +99,7 @@ module Lutaml
           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,
           }
@@ -116,14 +109,16 @@ module Lutaml
         # @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 = 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)
           options = {
             xmi_root_model: @xmi_root_model,
-            xmi_cache: @xmi_cache,
+            id_name_mapping: @id_name_mapping,
             with_gen: true,
             with_absolute_path: true,
           }

data/lib/lutaml/xmi.rb

@@ -1,4 +1,3 @@
-require "lutaml/xmi/version"
 require "lutaml/xmi/parsers/xml"
 require "liquid"
 require "lutaml/path"

data/lutaml.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 2.7.0" # rubocop:disable Gemspec/RequiredRubyVersion
 
   spec.add_dependency "expressir", "~> 2.1.0"
   spec.add_dependency "hashie", "~> 4.1.0"
@@ -40,14 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "parslet", "~> 2.0.0"
   spec.add_dependency "ruby-graphviz", "~> 1.2"
   spec.add_dependency "thor", "~> 1.0"
-  spec.add_dependency "xmi", "~> 0.3.12"
-
-  spec.add_development_dependency "byebug"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6.0"
-  spec.add_development_dependency "pry", "~> 0.12.2"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.11"
-  spec.add_development_dependency "rubocop", "~> 1.58"
-  spec.add_development_dependency "rubocop-performance", "~> 1.19"
+  spec.add_dependency "xmi", "~> 0.3.20"
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.32
+  version: 0.9.34
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -170,112 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.12
+        version: 0.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.12
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.58'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.58'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.19'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 0.3.20
 description: 'LutaML: data models in textual form'
 email:
 - open.source@ribose.com'
@@ -409,6 +311,7 @@ files:
 - lib/lutaml/xmi/liquid_drops/association_drop.rb
 - lib/lutaml/xmi/liquid_drops/attribute_drop.rb
 - lib/lutaml/xmi/liquid_drops/cardinality_drop.rb
+- lib/lutaml/xmi/liquid_drops/connector_drop.rb
 - lib/lutaml/xmi/liquid_drops/constraint_drop.rb
 - lib/lutaml/xmi/liquid_drops/data_type_drop.rb
 - lib/lutaml/xmi/liquid_drops/diagram_drop.rb
@@ -420,9 +323,9 @@ files:
 - lib/lutaml/xmi/liquid_drops/operation_drop.rb
 - lib/lutaml/xmi/liquid_drops/package_drop.rb
 - lib/lutaml/xmi/liquid_drops/root_drop.rb
+- lib/lutaml/xmi/liquid_drops/source_target_drop.rb
 - lib/lutaml/xmi/parsers/xmi_base.rb
 - lib/lutaml/xmi/parsers/xml.rb
-- lib/lutaml/xmi/version.rb
 - lib/lutaml/xml.rb
 - lib/lutaml/xml/parsers/xml.rb
 - lutaml.gemspec

data/lib/lutaml/xmi/version.rb

@@ -1,5 +0,0 @@
-module Lutaml
-  module XMI
-    VERSION = "0.2.3"
-  end
-end