lutaml 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3bdc3f066879a36efeca4609e9aca838d50a6708a1112b403da3c67a2e1d4dc
-  data.tar.gz: '085cc25361b1aff8bd5ee4910230ceb5420a9830fbaeaa811b60c85b20de8f18'
+  metadata.gz: '00689211648c9cfcc32eed2a9ef1e49c3992096cdc6441eae5c96bff2ce7830d'
+  data.tar.gz: 6be87ad65a48ef86856042a929538bc525ad9f6f347005bcfe1425c5c376ee58
 SHA512:
-  metadata.gz: a29744b9dabc937dd635e33b93270a3cdbd28c3735fd8975fd459b0193e98db38cc6e15ad499185135294f4a8fcb10ce0f52c8ecade9ed9ad81dffef23e8245a
-  data.tar.gz: bbb498bc86c6752dfdbde5a54737cd522d20c2e04e4a6a1a59737c95b2c3c7600d452049412c6338a7dc028b0d33314f606a0fd3af98623e962ef68193d21f00
+  metadata.gz: 2693eb3a76f8ec311dc24e9af82dc549783156fabb7139afe2d8cfac3c28b27b9ad2bb7a9e5dc562ef4864963b52eddcff287075fc881284ac292020d83df3fb
+  data.tar.gz: d238a14995787d8555f7292c4354703d007a6ebb7f3908f7a10cbe599363f6d0ab646006d21933992dd9ecabab1ad3827c0d517d9ceb67ebe51eb41cc2a349ba

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.1".freeze
+  VERSION = "0.9.3".freeze
 end

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

@@ -117,21 +117,36 @@ module Lutaml
         def serialize_model_enums(package)
           package.packaged_element.select { |e| e.type?("uml:Enumeration") }
             .map do |enum|
-            # xpath .//ownedLiteral[@xmi:type="uml:EnumerationLiteral"]
-            owned_literals = enum.owned_literal.map do |owned_literal|
-              owned_literal.to_hash.transform_keys(&:to_sym)
-            end
-
             {
               xmi_id: enum.id,
               name: enum.name,
-              values: owned_literals,
+              values: serialize_enum_owned_literal(enum),
               definition: doc_node_attribute_value(enum.id, "documentation"),
               stereotype: doc_node_attribute_value(enum.id, "stereotype"),
             }
           end
         end
 
+        # @param model [Shale::Mapper]
+        # @return [Hash]
+        # @note xpath .//ownedLiteral[@xmi:type="uml:EnumerationLiteral"]
+        def serialize_enum_owned_literal(enum)
+          owned_literals = enum.owned_literal.select do |owned_literal|
+            owned_literal.type? "uml:EnumerationLiteral"
+          end
+
+          owned_literals.map do |owned_literal|
+            # xpath .//type
+            uml_type_id = owned_literal&.uml_type&.idref
+
+            {
+              name: owned_literal.name,
+              type: lookup_entity_name(uml_type_id) || uml_type_id,
+              definition: lookup_attribute_documentation(owned_literal.id),
+            }
+          end
+        end
+
         # @param model [Shale::Mapper]
         # @return [Array<Hash>]
         # @note xpath ./packagedElement[@xmi:type="uml:DataType"]
@@ -483,14 +498,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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir