lutaml-xmi 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 629f979aa19a9752da8b4c75d763fc4b7cb2bb7e8c94ecf99080f6b69cc7cb91
-  data.tar.gz: 3d43008c0fdf0cba05f2266129aaa6e2f1e3d3ca21ecde1e0226d1dd9f6e3b09
+  metadata.gz: 5f4a8a80a350203d62586a60fb8b4c4021251953dc7cf6840b79433b164149e4
+  data.tar.gz: aac4b122d79b8d83dac436363dbd062ff5286b330c2bd106db5f1ab952e0f06b
 SHA512:
-  metadata.gz: 35c6eaef31f0041dca19d776f6dde6150aafa50cfd7bc24c0fbab21deb5d7bd9193ba87df698ebda194c2ad58c58c6daf1880a2a09d3b961786cb786b7601b0e
-  data.tar.gz: 70294ad01b275265d8106690cb34ee82694546f1746bbb9cae24d2b14041f2194d09025c2eea932be994b529300566519b8dd85fb9ff65d859f2e66bcfb2f9ca
+  metadata.gz: 6dcb83373821cf4d5859180ecebe65e24c75e903f0d44a8b97d87c67ded4ef0eb51894a6cc43dc64d2b3d6bbd0a6abcadee207d8d5c2457e076f4189e4f39f52
+  data.tar.gz: 74fa008e8ce12702db9a66afc9ce1aaf7e34b05fea9def10e09898fc750ea99b119218765c55bcfd0ec75a78b09aea94602837478247ec32d9f1842e32fa3f67

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

@@ -91,13 +91,15 @@ module Lutaml
           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)
-            {
-              xmi_id: link["xmi:id"],
-              member_end: member_end,
-              member_end_type: member_end_type,
-              member_end_cardinality: member_end_cardinality,
-              member_end_attribute_name: member_end_attribute_name,
-            }
+            if member_end && member_end != klass["name"]
+              {
+                xmi_id: link["xmi:id"],
+                member_end: member_end,
+                member_end_type: member_end_type,
+                member_end_cardinality: member_end_cardinality,
+                member_end_attribute_name: member_end_attribute_name,
+              }
+            end
           end
         end
 
@@ -111,6 +113,7 @@ module Lutaml
         end
 
         def serialize_member_type(owned_xmi_id, link)
+          return if link.name == 'NoteLink'
           return generalization_association(owned_xmi_id, link) if link.name == "Generalization"
 
           xmi_id = link.attributes["start"].value
@@ -135,11 +138,12 @@ module Lutaml
           if link.attributes["start"].value == owned_xmi_id
             xmi_id = link.attributes["end"].value
             member_end_type = "inheritance"
+            member_end = lookup_entity_name(xmi_id) || connector_target_name(xmi_id)
           else
             xmi_id = link.attributes["start"].value
             member_end_type = "generalization"
+            member_end = lookup_entity_name(xmi_id) || connector_source_name(xmi_id)
           end
-          member_end = lookup_entity_name(xmi_id)
 
           member_end_node = main_model.xpath(%(//ownedAttribute[@association]/type[@xmi:idref="#{xmi_id}"])).first
           if member_end_node
@@ -203,7 +207,7 @@ module Lutaml
         end
 
         def lookup_entity_name(xmi_id)
-          xmi_cache[xmi_id] ||= model_node_name_by_xmi_id(xmi_id) || connector_source_name(xmi_id)
+          xmi_cache[xmi_id] ||= model_node_name_by_xmi_id(xmi_id)
           xmi_cache[xmi_id]
         end
 
@@ -214,6 +218,13 @@ module Lutaml
           node.attributes["name"]&.value
         end
 
+        def connector_target_name(xmi_id)
+          node = main_model.xpath(%(//target[@xmi:idref="#{xmi_id}"]/model)).first
+          return unless node
+
+          node.attributes["name"]&.value
+        end
+
         def model_node_name_by_xmi_id(xmi_id)
           node = main_model.xpath(%(//*[@xmi:id="#{xmi_id}"])).first
           return unless node

data/lib/lutaml/xmi/version.rb

@@ -1,5 +1,5 @@
 module Lutaml
   module XMI
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

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