lutaml 0.9.5 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ca459e9a9372f0cf43b63dbb3b02f534ef5f50afe3cb0d2650798f01c67359
-  data.tar.gz: d66d92464a7166148e8725790c6e83d35d243885e619832dcfd2945c22940cdd
+  metadata.gz: 4db5dffc542b1571b200b43d83253caafa1f90cd67aec5ece16af26a31ac5f8b
+  data.tar.gz: 9e12f4317fb3a5690d5475ebec249cbafa92de81d1f813845438062dfd51083d
 SHA512:
-  metadata.gz: 361dc2a5e46c112ebccf9582833cc9fede0f9044b7adf25f269093a5b6c575ac644a31f41e2b08fa3c6f01999f6903d15d8068b6c094aadad12b0bea4fe85fdd
-  data.tar.gz: 22574311ce9cc5b91ec3592dc6155c0316f049dc0e9f615750408e6390b5895a62d869c2a9f2fae8032433881ad4bdd1ba7752d45919f0ebe0d2a50aebca53f4
+  metadata.gz: 2e15272b553e564a0432e758d56e00cae2c79a8c8e166615812ad5e05004b9c5fe2e33a667d6910ffd6fc1156365fed895d1aa2c4412da4892511edd324c0785
+  data.tar.gz: 16281e22ee7b86fba771f7eee75455bfcd175c0ac4af02ecdda5538bd75a63ecaaa71cbdfde4e5815f5d5a15db1bbf11be5d129fd71285d3219cc4702d9c4561

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.5".freeze
+  VERSION = "0.9.7".freeze
 end

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

@@ -100,6 +100,7 @@ module Lutaml
               xmi_id: klass.id,
               name: klass.name,
               package: model,
+              type: klass.type.split(":").last,
               attributes: serialize_class_attributes(klass),
               associations: serialize_model_associations(klass.id),
               operations: serialize_class_operations(klass),
@@ -336,12 +337,19 @@ 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)
           [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)
+          connector_labels(xmi_id, source_or_target) ||
+            lookup_entity_name(xmi_id) ||
+            connector_name_by_source_or_target(xmi_id, source_or_target)
+        end
+
         # @param owner_xmi_id [String]
         # @param link [Shale::Mapper]
         # @param link_member_name [String]
@@ -401,8 +409,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)
 
           member_end_cardinality, _member_end_attribute_name =
             fetch_owned_attribute_node(xmi_id)
@@ -534,15 +541,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]

data/lutaml.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "parslet", "~> 2.0.0"
   spec.add_runtime_dependency "ruby-graphviz", "~> 1.2"
   spec.add_runtime_dependency "thor", "~> 1.0"
-  spec.add_runtime_dependency "xmi", ">= 0.3.6"
+  spec.add_runtime_dependency "xmi", ">= 0.3.8"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement