lutaml 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4db5dffc542b1571b200b43d83253caafa1f90cd67aec5ece16af26a31ac5f8b
-  data.tar.gz: 9e12f4317fb3a5690d5475ebec249cbafa92de81d1f813845438062dfd51083d
+  metadata.gz: 6cdc354ae49059f9158e3bfb8d0e7813b6c61d0084fa42ed7071026a9e62d311
+  data.tar.gz: 30c6683d8e22d2e1ded1b8ca53d3d63e5129025049314b036b678efb611f713e
 SHA512:
-  metadata.gz: 2e15272b553e564a0432e758d56e00cae2c79a8c8e166615812ad5e05004b9c5fe2e33a667d6910ffd6fc1156365fed895d1aa2c4412da4892511edd324c0785
-  data.tar.gz: 16281e22ee7b86fba771f7eee75455bfcd175c0ac4af02ecdda5538bd75a63ecaaa71cbdfde4e5815f5d5a15db1bbf11be5d129fd71285d3219cc4702d9c4561
+  metadata.gz: 1578a3589e20f92586cf4a60a6585ce5b758262a1112e3e5598e33c3209de72d477bf66b0fefd017e4633bd065ef93ed3fe37e2b55f60aae50a78203f299bcfa
+  data.tar.gz: 72883f24b869448ac32f8724cb05cd5d24acf88ecbaa066bf084724f57ac116567266257f317b0e284e8ab081519eae6d8a2108915fb4e680076990b43339576

data/lib/lutaml/version.rb

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

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

@@ -20,15 +20,8 @@ module Lutaml
         # @param options [Hash] options for parsing
         # @return [Lutaml::Uml::Document]
         def self.parse(xml, _options = {})
-          sparx_root = Xmi::Sparx::SparxRoot
-          xmi_doc = Nokogiri::XML(File.read(xml))
-          namespace = xmi_doc.at_xpath("//xmi:XMI").namespaces
-          if namespace["xmlns:uml"].split("/").last == "20131001"
-            sparx_root = Xmi::Sparx::SparxRoot2013
-          end
-
           xml_content = File.read(xml)
-          xmi_model = sparx_root.from_xml(xml_content)
+          xmi_model = Xmi::Sparx::SparxRoot.parse_xml(xml_content)
           new.parse(xmi_model)
         end
 
@@ -337,17 +330,26 @@ module Lutaml
             source_or_target = :target
           end
 
-          member_end = member_end_name(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)
-          connector_labels(xmi_id, source_or_target) ||
-            lookup_entity_name(xmi_id) ||
-            connector_name_by_source_or_target(xmi_id, source_or_target)
+        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]
@@ -409,7 +411,7 @@ module Lutaml
             source_or_target = :target
           end
 
-          member_end = member_end_name(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)
@@ -621,8 +623,7 @@ module Lutaml
         def select_all_packaged_elements(all_elements, model, type)
           select_all_items(all_elements, model, type, :packaged_element)
           all_elements.delete_if do |e|
-            !e.is_a?(Xmi::Uml::PackagedElement) &&
-              !e.is_a?(Xmi::Uml::PackagedElement2013)
+            !e.is_a?(Xmi::Uml::PackagedElement)
           end
         end
 

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.8"
+  spec.add_runtime_dependency "xmi", "~> 0.3.10"
 
   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.7
+  version: 0.9.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-19 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -112,16 +112,16 @@ dependencies:
   name: xmi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.10
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement