lutaml 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a28dfbb8000b5253d9d608012982cd3a2452f19eac1323cf034a198b87fdc384
-  data.tar.gz: 4290b8b705eb7c39c76fe7189581186d41bdaa46cf1c0f2999adb14d6b422103
+  metadata.gz: 7d1677e27d1216994f6619acc558721d9b2d6107dd30fd6776232965d6d1d219
+  data.tar.gz: e8999116cdee14d6316f9bedaa781893ae2d27b88f93aef514fdda435e8d29b6
 SHA512:
-  metadata.gz: 1a08b0cb64f7aa47270690672a51e66214bbb0f5b23824a3b5b96f669b1a78fd5d9219afaa527ea1e5777f59803738b08a756cf77bf81408399871203fd48359
-  data.tar.gz: 7ad597883806052a6b487008b3202406b824f636e75bb98df640d025bc69662117b2de626ce492f268ac8489707a22954650976bfbbd3f68ddb45e0ed469b1fb
+  metadata.gz: 37c0d7fb4a3676a45fc8ebbab3bfab3e993ad84e005a8a7d642a1af66c3600271d1a03b723a2b7ff8462a96a75605c5bce06425393047c9fcdcd16c38c1b603f
+  data.tar.gz: e287823e6e238754223823ccabaebe31f13332b26efb67ac97d1c3f103cdf512f5a7be9276653f826983fe87e991b221772115b1c3d0bb09bb5745db1f2b0dd2

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.6".freeze
+  VERSION = "0.9.8".freeze
 end

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

@@ -337,12 +337,28 @@ module Lutaml
             source_or_target = :target
           end
 
-          member_end = lookup_entity_name(xmi_id) ||
-            connector_name_by_source_or_target(xmi_id, source_or_target)
-
+          member_end = member_end_name(xmi_id, source_or_target, link.name)
           [member_end, xmi_id]
         end
 
+        # @param xmi_id [String]
+        # @param source_or_target [Symbol]
+        # @return [String]
+        def member_end_name(xmi_id, source_or_target, link_name)
+          connector_label = connector_labels(xmi_id, source_or_target)
+          entity_name = lookup_entity_name(xmi_id)
+          connector_name = connector_name_by_source_or_target(
+            xmi_id, source_or_target
+          )
+
+          case link_name
+          when "Aggregation"
+            connector_label || entity_name || connector_name
+          else
+            entity_name || connector_name
+          end
+        end
+
         # @param owner_xmi_id [String]
         # @param link [Shale::Mapper]
         # @param link_member_name [String]
@@ -402,8 +418,7 @@ module Lutaml
             source_or_target = :target
           end
 
-          member_end = lookup_entity_name(xmi_id) ||
-            connector_name_by_source_or_target(xmi_id, source_or_target)
+          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)
@@ -535,15 +550,32 @@ 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)
-          node = @xmi_root_model.extension.connectors.connector.select do |con|
+        def connector_node_by_id(xmi_id, source_or_target)
+          @xmi_root_model.extension.connectors.connector.find do |con|
             con.send(source_or_target.to_sym).idref == xmi_id
           end
-          return if node.empty? ||
-            node.first.send(source_or_target.to_sym).nil? ||
-            node.first.send(source_or_target.to_sym).model.nil?
+        end
+
+        # @param xmi_id [String]
+        # @param source_or_target [String]
+        # @return [String]
+        def connector_name_by_source_or_target(xmi_id, source_or_target)
+          node = connector_node_by_id(xmi_id, source_or_target)
+          return if node.nil? ||
+            node.send(source_or_target.to_sym).nil? ||
+            node.send(source_or_target.to_sym).model.nil?
+
+          node.send(source_or_target.to_sym).model.name
+        end
+
+        # @param xmi_id [String]
+        # @param source_or_target [String]
+        # @return [String]
+        def connector_labels(xmi_id, source_or_target)
+          node = connector_node_by_id(xmi_id, source_or_target)
+          return if node.nil?
 
-          node.first.send(source_or_target.to_sym).model.name
+          node.labels&.rt || node.labels&.lt
         end
 
         # @param xmi_id [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir