lutaml-xmi 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8097eb270cce873bbed9f698a85383bc579844db4729be05923d2866bb2d47a
-  data.tar.gz: 327a2b1dfe675de37dc5ba0cffeb502581c8889dc62193ac0fa96ad166bea477
+  metadata.gz: 00fbd8ecac2e908005b2e8721296f5ad95c49bd164b32bc9954e8bf94d82ad18
+  data.tar.gz: 14e0bffadfb34e0980fba6d535576b3fff50b663c2f26f3174b1ab908a1883d2
 SHA512:
-  metadata.gz: b222a705723f2f07767955f17f4a3789dce863697d865937708c3abdf0c59fa100dfdd754f188930a131950e9ab5e033ebb3be8d447ddf06f9c400157837f984
-  data.tar.gz: 8772040cc940d2de1389592ea7a3fb3b06c2d114d17511072d8bb4abe748d26111d58b4bcff626e1d3b55bb6b98a9ba017a52572b6853be399dfd650721d36ba
+  metadata.gz: 432706c232ea18b66169dad9ce3a5f25612824563cde18484b3e83bab07804a503b7c145e62c67d0516e0b3ea83f38e6ed7fda461ee88b5d4a0a9a153142a300
+  data.tar.gz: 40d9499f0866b91bd5b04a8d2e47b0b894c82f6a129893f8b0d1f57e15ac37981d9a12c87b14f5f2acb0bbd6e4dd797ed910d28379f159bafed63e187947857d

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

@@ -127,10 +127,13 @@ module Lutaml
         def serialize_model_associations(klass)
           xmi_id = klass["xmi:id"]
           main_model.xpath(%(//element[@xmi:idref="#{xmi_id}"]/links/*)).map do |link|
-            member_end, member_end_type, member_end_cardinality, member_end_attribute_name = serialize_member_type(xmi_id, link)
-            owned_end_cardinality, owned_end_attribute_name = serialize_owned_type(xmi_id, link)
+            link_member_name = link.attributes["start"].value == xmi_id ? "end" : "start"
+            linke_owner_name = link_member_name == "start" ? "end" : "start"
+            member_end, member_end_type, member_end_cardinality, member_end_attribute_name = serialize_member_type(xmi_id, link, link_member_name)
+            owner_end, owner_end_cardinality, owner_end_attribute_name = serialize_owned_type(xmi_id, link, linke_owner_name)
             if member_end && ((member_end_type != 'aggregation') || (member_end_type == 'aggregation' && member_end_attribute_name))
-              definition_node = main_model.xpath(%(//connector[@xmi:idref="#{link['xmi:id']}"]/target/documentation)).first
+              doc_node_name = link_member_name == "start" ? "source" : "target"
+              definition_node = main_model.xpath(%(//connector[@xmi:idref="#{link['xmi:id']}"]/#{doc_node_name}/documentation)).first
               definition = definition_node.attributes['value']&.value if definition_node
               {
                 xmi_id: link["xmi:id"],
@@ -138,6 +141,7 @@ module Lutaml
                 member_end_type: member_end_type,
                 member_end_cardinality: member_end_cardinality,
                 member_end_attribute_name: member_end_attribute_name,
+                owner_end: owner_end,
                 definition: definition
               }
             end
@@ -167,11 +171,12 @@ module Lutaml
           end
         end
 
-        def serialize_owned_type(owned_xmi_id, link)
+        def serialize_owned_type(owner_xmi_id, link, linke_owner_name)
           return if link.name == 'NoteLink'
-          return generalization_association(owned_xmi_id, link) if link.name == "Generalization"
+          return generalization_association(owner_xmi_id, link) if link.name == "Generalization"
 
-          xmi_id = link.attributes["start"].value
+          xmi_id = link.attributes[linke_owner_name].value
+          owner_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
@@ -197,18 +202,19 @@ module Lutaml
             end
           end
 
-          [owned_cardinality, owned_attribute_name]
+          [owner_end, owned_cardinality, owned_attribute_name]
         end
 
-        def serialize_member_type(owned_xmi_id, link)
+        def serialize_member_type(owner_xmi_id, link, link_member_name)
           return if link.name == 'NoteLink'
-          return generalization_association(owned_xmi_id, link) if link.name == "Generalization"
+          return generalization_association(owner_xmi_id, link) if link.name == "Generalization"
 
-          xmi_id = link.attributes["start"].value
+          xmi_id = link.attributes[link_member_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']}"]/target)).first
+            connector_type = link_member_name == "start" ? "source" : "target"
+            assoc_connector = main_model.xpath(%(//connector[@xmi:idref="#{link['xmi:id']}"]/#{connector_type})).first
             if assoc_connector
               connector_type = assoc_connector.children.find { |node| node.name == 'type' }
               if connector_type && connector_type.attributes['multiplicity']
@@ -234,8 +240,8 @@ module Lutaml
           [member_end, "aggregation", member_end_cardinality, member_end_attribute_name]
         end
 
-        def generalization_association(owned_xmi_id, link)
-          if link.attributes["start"].value == owned_xmi_id
+        def generalization_association(owner_xmi_id, link)
+          if link.attributes["start"].value == owner_xmi_id
             xmi_id = link.attributes["end"].value
             member_end_type = "inheritance"
             member_end = lookup_entity_name(xmi_id) || connector_target_name(xmi_id)

data/lib/lutaml/xmi/version.rb

@@ -1,5 +1,5 @@
 module Lutaml
   module XMI
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/lutaml/parsers/xmi_spec.rb

@@ -88,7 +88,6 @@ RSpec.describe Lutaml::XMI::Parsers::XML do
       end
       let(:expected_association_names) do
         %w[
-          TemporalGeometricPrimitive
           Primitive
           TemporalGeometry
           Interval
@@ -133,11 +132,6 @@ RSpec.describe Lutaml::XMI::Parsers::XML do
         inheritance = klass.associations.find { |entity| entity.member_end == 'TemporalGeometry' }
         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 == '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
 
       it "correctly parses diagrams for package" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-xmi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie