lutaml-xmi 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00a23b9d7e93a56e34c86e1aebb2c4e4917ace9fed7ed50926d2bb9242931b1
-  data.tar.gz: cfde230682ae5f9c6fc6b5092443ac738a53442d6b9955902904cc5fb290a843
+  metadata.gz: 7aa59d686f5cec8d4bc3f145fdb89e7f56cc144ad573e2cf6743201a319b8414
+  data.tar.gz: 347bb418b224b5e7f565b2cdabb10edf63a13ffeef61017c324fbaaec1163066
 SHA512:
-  metadata.gz: d92ce6ba9d8e008912d9647be32c1f784621cd3a292b37918b84e8cca28adc1e1bd6e1ddaa721c7b6209de1095f6f656c9dc5fe39d1b3bb0341306376236ae57
-  data.tar.gz: d18f47d8da98bcf892ee5aa9de530b02c6222de41afa8770d026cbc5a98f84f966025f31a87488d12af07a76f27b0deb2109a6eb6effd53c76a0d7369203b871
+  metadata.gz: 66197ddf677dccaf10859e3ce997dc91c96c5135306db310030d802c63637b4a21adc3978c23d73c4fc2a19b6502d6dc314f1b99a2379b4b82dcf863fd8f21a0
+  data.tar.gz: acbd3a66c75abc3ebe8ef6c14019db023984b94f060202a49f27c811d6b00f1cd5edc3b6bde80df7873587cfd2e00b1c2588f7db9031c1827644aba5a5d42097

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

@@ -117,18 +117,30 @@ module Lutaml
           return generalization_association(owned_xmi_id, link) if link.name == "Generalization"
 
           xmi_id = link.attributes["start"].value
-          member_end = lookup_entity_name(xmi_id)
-
-          member_end_node = if link.name == "Association"
-                              link_xmk_id = link["xmi:id"]
-                              main_model.xpath(%(//packagedElement[@xmi:id="#{link_xmk_id}"]//type[@xmi:idref="#{xmi_id}"])).first
-                            else
-                              main_model.xpath(%(//ownedAttribute[@association]/type[@xmi:idref="#{xmi_id}"])).first
-                            end
-          if member_end_node
-            assoc = member_end_node.parent
-            member_end_cardinality = { "min" => cardinality_min_value(assoc), "max" => cardinality_max_value(assoc) }
-            member_end_attribute_name = assoc.attributes["name"]&.value
+          member_end = lookup_entity_name(xmi_id) || connector_source_name(xmi_id)
+
+          if link.name == "Association"
+            assoc_connector = main_model.xpath(%(//connector[@xmi:idref="#{link['xmi:id']}"]/source)).first
+            if assoc_connector
+              connector_type = assoc_connector.children.find { |node| node.name == 'type' }
+              if connector_type && connector_type.attributes['multiplicity']
+                cardinality = connector_type.attributes['multiplicity']&.value&.split('..')
+                cardinality.unshift('1') if cardinality.length == 1
+                min, max = cardinality
+              end
+              connector_role = assoc_connector.children.find { |node| node.name == 'role' }
+              if connector_role
+                member_end_attribute_name = connector_role.attributes["name"]&.value
+              end
+              member_end_cardinality = { "min" => LOVER_VALUE_MAPPINGS[min], "max" => max }
+            end
+          else
+            member_end_node = main_model.xpath(%(//ownedAttribute[@association]/type[@xmi:idref="#{xmi_id}"])).first
+            if member_end_node
+              assoc = member_end_node.parent
+              member_end_cardinality = { "min" => cardinality_min_value(assoc), "max" => cardinality_max_value(assoc) }
+              member_end_attribute_name = assoc.attributes["name"]&.value
+            end
           end
 
           [member_end, "aggregation", member_end_cardinality, member_end_attribute_name]

data/lib/lutaml/xmi/version.rb

@@ -1,5 +1,5 @@
 module Lutaml
   module XMI
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lutaml-xmi.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "hashie", "~> 4.1.0"
   spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_runtime_dependency "lutaml-uml"
+  spec.add_runtime_dependency "nokogiri", "~> 1.10"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "nokogiri", "~> 1.10"
   spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/spec/lutaml/parsers/xmi_spec.rb

@@ -89,8 +89,8 @@ RSpec.describe Lutaml::XMI::Parsers::XML do
       let(:expected_association_names) do
         %w[
           TemporalGeometricPrimitive
+          Primitive
           TemporalGeometry
-          TemporalTopologicalPrimitive
           Interval
           Instant
         ]
@@ -134,8 +134,8 @@ RSpec.describe Lutaml::XMI::Parsers::XML do
         expect(inheritance.member_end_type).to eq('inheritance')
         expect(inheritance.member_end_cardinality).to eq({"min"=>"C", "max"=>"*"})
 
-        aggregation = klass.associations.find { |entity| entity.member_end == 'TemporalTopologicalPrimitive' }
-        expect(aggregation.member_end_attribute_name).to eq('topology')
+        aggregation = klass.associations.find { |entity| entity.member_end == 'TemporalGeometricPrimitive' }
+        expect(aggregation.member_end_attribute_name).to eq('element')
         expect(aggregation.member_end_type).to eq('aggregation')
         expect(aggregation.member_end_cardinality).to eq({"min"=>"C", "max"=>"*"})
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-xmi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '1.10'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: XML Metadata Interchange (XMI) Specification parser in Ruby, tools for accessing