lutaml 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4a5e17292ce48ecab9f02dfbc1ba4630fd8ccc8abbeef241830dba6751b21e3
-  data.tar.gz: 82da115e0396750610178e711864546b19212f55a6a5119ce12464c0337a45a6
+  metadata.gz: 7fe23c8f2af27bf3016adc461338dab47dcbf0179237fef38e2b30ef068e2adc
+  data.tar.gz: 2382b0189342f7e559129af75829c642b4737f934cc2a83821cb2300484813d3
 SHA512:
-  metadata.gz: d07503ca2cdf8d33fb64f17dccf2eb0fefccbdc0853887713a8f62df1248799589b4cf5b017defbff2611f92563107bbc24f3a6a269d44775cad68a01e843c03
-  data.tar.gz: '00392dc2b1a84f56343486d677c1494564d7ef46d26fc2d63eebc92ae29b0861488b812726a529a4d6f0b371e2bad72c1163912d6f0ea3752d6f0c26f02c9762'
+  metadata.gz: a722350e941888b75fd6437fc7e2b491247cfae144414b400c49d77f522b38cea9b70579010f3bb6bfc5b859058cba6985e65b885e997780bd1aa6d7c3be40b8
+  data.tar.gz: 160e71a7c27b78b4d2c582a8de3b6b3fc1815e3f1c915b487cf0dbd06ddd7436ddb0b18e331b4c76483f621982fd2ce0697744b5cd25620436c8374c9bae513f

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.0".freeze
+  VERSION = "0.9.2".freeze
 end

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

@@ -57,10 +57,12 @@ module Lutaml
         # @return [Array<Hash>]
         # @note xpath ./packagedElement[@xmi:type="uml:Package"]
         def serialize_model_packages(model)
-          model.packaged_element.map do |package|
+          model.packaged_element.select do |e|
+            e.type?("uml:Package")
+          end.map do |package|
             {
               xmi_id: package.id,
-              name: package.name,
+              name: get_package_name(package),
               classes: serialize_model_classes(package, model),
               enums: serialize_model_enums(package),
               data_types: serialize_model_data_types(package),
@@ -72,6 +74,18 @@ module Lutaml
           end
         end
 
+        def get_package_name(package)
+          return package.name unless package.name.nil?
+
+          connector = fetch_connector(package.id)
+          if connector.target&.model && connector.target.model&.name
+            return "#{connector.target.model.name} " \
+                   "(#{package.type.split(':').last})"
+          end
+
+          "unnamed"
+        end
+
         # @param package [Shale::Mapper]
         # @param model [Shale::Mapper]
         # @return [Array<Hash>]
@@ -164,7 +178,8 @@ module Lutaml
           matched_element = @xmi_root_model.extension.elements.element
             .find { |e| e.idref == xmi_id }
 
-          return if !matched_element.links ||
+          return if !matched_element ||
+            !matched_element.links ||
             matched_element.links.association.empty?
 
           matched_element.links.association.map do |assoc|
@@ -468,14 +483,30 @@ module Lutaml
           doc_node.properties.send(Shale::Utils.snake_case(attr_name).to_sym)
         end
 
+        # @param xmi_id [String]
+        # @return [Shale::Mapper]
+        # @note xpath %(//attribute[@xmi:idref="#{xmi_id}"])
+        def fetch_attribute_node(xmi_id)
+          attribute_node = nil
+          @xmi_root_model.extension.elements.element.each do |e|
+            if e.attributes&.attribute
+              e.attributes.attribute.each do |a|
+                attribute_node = a if a.idref == xmi_id
+              end
+            end
+          end
+          attribute_node
+        end
+
         # @param xmi_id [String]
         # @return [String]
         # @note xpath %(//attribute[@xmi:idref="#{xmi_id}"]/documentation)
         def lookup_attribute_documentation(xmi_id)
-          doc_node = fetch_element(xmi_id)
-          return unless doc_node
+          attribute_node = fetch_attribute_node(xmi_id)
+
+          return unless attribute_node&.documentation
 
-          doc_node.documentation
+          attribute_node&.documentation&.value
         end
 
         # @param xmi_id [String]

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"
+  spec.add_runtime_dependency "xmi", ">= 0.3.0"
 
   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.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement