lutaml 0.9.33 → 0.9.35

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
@@ -112,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
@@ -312,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
 
@@ -524,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]
@@ -579,7 +585,9 @@ module Lutaml
           when "NoteLink"
             return
           when "Generalization"
-            return generalization_association(owner_xmi_id, link)
+            owner_end, _owner_end_type, _owner_xmi_id =
+              generalization_association(owner_xmi_id, link)
+            return owner_end
           end
 
           xmi_id = link.send(linke_owner_name.to_sym)
@@ -617,7 +625,7 @@ module Lutaml
           end
 
           member_end = member_end_name(xmi_id, source_or_target, link.name)
-          [member_end, xmi_id]
+          [member_end, "aggregation", xmi_id]
         end
 
         # @param xmi_id [String]
@@ -642,8 +650,9 @@ 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)
-          member_end, xmi_id = serialize_member_end(owner_xmi_id, link)
+        def serialize_member_type(owner_xmi_id, link, link_member_name) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+          member_end, member_end_type, xmi_id =
+            serialize_member_end(owner_xmi_id, link)
 
           if link.name == "Association"
             connector_type = link_member_name == "start" ? "source" : "target"
@@ -654,16 +663,26 @@ module Lutaml
               fetch_owned_attribute_node(xmi_id)
           end
 
-          [member_end, "aggregation", member_end_cardinality,
+          if fetch_connector_name(link.id)
+            member_end = fetch_connector_name(link.id)
+          end
+
+          [member_end, member_end_type, 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
@@ -672,9 +691,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
@@ -699,10 +717,10 @@ module Lutaml
 
           member_end = member_end_name(xmi_id, source_or_target, link.name)
 
-          member_end_cardinality, _member_end_attribute_name =
-            fetch_owned_attribute_node(xmi_id)
-
-          [member_end, member_end_type, member_end_cardinality, nil, xmi_id]
+          # member_end_cardinality, _member_end_attribute_name =
+          #   fetch_owned_attribute_node(xmi_id)
+          # [member_end, member_end_type, member_end_cardinality, nil, xmi_id]
+          [member_end, member_end_type, xmi_id]
         end
 
         # Multiple items if search type is idref.  Should search association?
@@ -880,7 +898,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
@@ -928,8 +946,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?

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.33
+  version: 0.9.35
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-09 00:00:00.000000000 Z
+date: 2025-06-27 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