lutaml-xmi 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00fbd8ecac2e908005b2e8721296f5ad95c49bd164b32bc9954e8bf94d82ad18
-  data.tar.gz: 14e0bffadfb34e0980fba6d535576b3fff50b663c2f26f3174b1ab908a1883d2
+  metadata.gz: 63fbe7f09179853abdedd141e18e2f66fbcb8f6018a8bed99a3128170d7a25bb
+  data.tar.gz: 874323dcf8ad23d86f83037382b2190b372aa747c768807f3b9f29999365b76c
 SHA512:
-  metadata.gz: 432706c232ea18b66169dad9ce3a5f25612824563cde18484b3e83bab07804a503b7c145e62c67d0516e0b3ea83f38e6ed7fda461ee88b5d4a0a9a153142a300
-  data.tar.gz: 40d9499f0866b91bd5b04a8d2e47b0b894c82f6a129893f8b0d1f57e15ac37981d9a12c87b14f5f2acb0bbd6e4dd797ed910d28379f159bafed63e187947857d
+  metadata.gz: 9a5844111850226727b714da4cde2ec8ca51ff50d0abdbf5980a78b280888b88492ba00a839d369a8f8df2c2549b40b6456a01243fe08142a1d6da5d366e3a1e
+  data.tar.gz: 1d348e32bf2b2ac4f3b6642e52e698b3f43cf4e4edebd9bd92b65b0a94f77cbb65dae9c9861eb2de916407f7ebae763735f3f29d4283290acd17a912e03ed700

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

@@ -1,4 +1,5 @@
 require "nokogiri"
+require "htmlentities"
 require "lutaml/uml/has_attributes"
 require "lutaml/uml/document"
 
@@ -7,7 +8,7 @@ module Lutaml
     module Parsers
       # Class for parsing .xmi schema files into ::Lutaml::Uml::Document
       class XML
-        LOVER_VALUE_MAPPINGS = {
+        LOWER_VALUE_MAPPINGS = {
           "0" => "C",
           "1" => "M",
         }.freeze
@@ -55,7 +56,7 @@ module Lutaml
         end
 
         def serialize_model_classes(model)
-          model.xpath('./packagedElement[@xmi:type="uml:Class"]').map do |klass|
+          model.xpath('./packagedElement[@xmi:type="uml:Class" or @xmi:type="uml:AssociationClass"]').map do |klass|
             {
               xmi_id: klass["xmi:id"],
               xmi_uuid: klass["xmi:uuid"],
@@ -145,7 +146,7 @@ module Lutaml
                 definition: definition
               }
             end
-          end
+          end.uniq
         end
 
         def serialize_class_operations(klass)
@@ -167,6 +168,7 @@ module Lutaml
             {
               xmi_id: constraint["xmi:id"],
               body: constraint["name"],
+              definition: HTMLEntities.new.decode(constraint["description"])
             }
           end
         end
@@ -191,7 +193,7 @@ module Lutaml
               if connector_role
                 owned_attribute_name = connector_role.attributes["name"]&.value
               end
-              owned_cardinality = { "min" => LOVER_VALUE_MAPPINGS[min], "max" => max }
+              owned_cardinality = { "min" => LOWER_VALUE_MAPPINGS[min], "max" => max }
             end
           else
             owned_node = main_model.xpath(%(//ownedAttribute[@association]/type[@xmi:idref="#{xmi_id}"])).first
@@ -210,7 +212,13 @@ module Lutaml
           return generalization_association(owner_xmi_id, link) if link.name == "Generalization"
 
           xmi_id = link.attributes[link_member_name].value
-          member_end = lookup_entity_name(xmi_id) || connector_source_name(xmi_id)
+          if link.attributes["start"].value == owner_xmi_id
+            xmi_id = link.attributes["end"].value
+            member_end = lookup_entity_name(xmi_id) || connector_target_name(xmi_id)
+          else
+            xmi_id = link.attributes["start"].value
+            member_end = lookup_entity_name(xmi_id) || connector_source_name(xmi_id)
+          end
 
           if link.name == "Association"
             connector_type = link_member_name == "start" ? "source" : "target"
@@ -226,7 +234,7 @@ module Lutaml
               if connector_role
                 member_end_attribute_name = connector_role.attributes["name"]&.value
               end
-              member_end_cardinality = { "min" => LOVER_VALUE_MAPPINGS[min], "max" => max }
+              member_end_cardinality = { "min" => LOWER_VALUE_MAPPINGS[min], "max" => max }
             end
           else
             member_end_node = main_model.xpath(%(//ownedAttribute[@association]/type[@xmi:idref="#{xmi_id}"])).first
@@ -286,7 +294,7 @@ module Lutaml
           return unless lower_value_node
 
           lower_value = lower_value_node.attributes["value"]&.value
-          LOVER_VALUE_MAPPINGS[lower_value]
+          LOWER_VALUE_MAPPINGS[lower_value]
         end
 
         def cardinality_max_value(node)

data/lib/lutaml/xmi/version.rb

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

data/lutaml-xmi.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_runtime_dependency "lutaml-uml"
   spec.add_runtime_dependency "nokogiri", "~> 1.10"
+  spec.add_runtime_dependency "htmlentities"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "byebug"

data/spec/lutaml/parsers/xmi_spec.rb

@@ -109,7 +109,7 @@ RSpec.describe Lutaml::XMI::Parsers::XML do
           .to(eq(["Temporal and Zonal Geometry", "Temporal and Zonal RS using Identifiers"]))
       end
 
-      it "correctly parses package` classes" do
+      it "correctly parses package classes" do
         expect(first_nested_package.classes.map(&:name)).to(eq(expected_class_names))
         expect(first_nested_package.classes.map(&:xmi_id)).to(eq(expected_class_xmi_ids))
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-xmi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement