lutaml 0.9.42 → 0.9.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b66d72112efe826e3e86d693b6710915c20df890036b2ce3085054a5227512
-  data.tar.gz: 4f255d33142b96347c7f8efcde22661ae8eff33a7bba7caecbff17f1a7f0362e
+  metadata.gz: 237ccb049aa43625e1ae6358777dbe0eace1ad3cb1ff787ba5b5f055746d8d96
+  data.tar.gz: 9158115470db6f478a7dd6a30e738ec388d4efa09b33531d3ed8093e93a024fd
 SHA512:
-  metadata.gz: c4d00853656f53a73d011ace7843d5443a6afd4e3447bdd8f9acfeb1d1a8f1dc6b9e40bfc94f8bdb441dc60ea7495b72d0a48ef203e292923b72c6be028fa4c1
-  data.tar.gz: 9426ded45a58f49d6b3de1b2279ca2bb64327d52dcb2d101314ad734caf70219421ebf00e0c23f59c662e0bbccc436ce47fba04bff666efa6899b0fecdb5f541
+  metadata.gz: 06a354ff8cf4d011b01b32df444c988a814c26cc6811dabccf394f5d05d1911a8c8e2cf9b31092c297ee9d9c1d2e602e8a5d4551dd8477752772b199a23f1d2c
+  data.tar.gz: 6fd0577fc2898d1ae1c2aba4fa6da813bf090799263645f45d6be0016b12e1ec7ad68a7674ebd5668a62ba128c7045d33338a862f3a4ff435099fdb15a090e74

data/lib/lutaml/converter/xmi_to_uml.rb

@@ -227,7 +227,7 @@ module Lutaml
       end
 
       def get_uml_general(general_id) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        general_node = get_general_node(general_id)
+        general_node = find_packaged_element_by_id(general_id)
         return [] unless general_node
 
         general_node_attrs = get_uml_general_attributes(general_node)
@@ -238,10 +238,10 @@ module Lutaml
           gen.general_id = general_id
           gen.general_name = general_node.name
           gen.general_attributes = general_node_attrs
-          gen.general_upper_klass = general_upper_klass
+          gen.general_upper_klass = general_upper_klass&.name
           gen.name = general_node.name
           gen.type = general_node.type
-          gen.definition = lookup_general_documentation(general_id)
+          gen.definition = lookup_element_prop_documentation(general_id)
           gen.stereotype = doc_node_attribute_value(general_id, "stereotype")
 
           if next_general_node_id

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.42".freeze
+  VERSION = "0.9.43".freeze
 end

data/lib/lutaml/xmi/liquid_drops/enum_drop.rb

@@ -41,7 +41,8 @@ module Lutaml
       # @return name of the upper packaged element
       def upper_packaged_element
         if @options[:with_gen]
-          find_upper_level_packaged_element(@model.id)
+          e = find_upper_level_packaged_element(@model.id)
+          e&.name
         end
       end
 

data/lib/lutaml/xmi/liquid_drops/generalization_drop.rb

@@ -38,16 +38,16 @@ module Lutaml
         !!@gen[:general]
       end
 
-      def attributes # rubocop:disable Metrics/MethodLength
+      def attributes # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
         attrs = @gen[:general_attributes]
         attrs.each do |i|
           name_ns = case i[:type_ns]
                     when "core", "gml"
-                      upper_klass
+                      upper_klass&.name
                     else
                       i[:type_ns]
                     end
-          name_ns = upper_klass if name_ns.nil?
+          name_ns = upper_klass&.name if name_ns.nil?
 
           i[:name_ns] = name_ns
           i[:name] = "" if i[:name].nil?

data/lib/lutaml/xmi/liquid_drops/klass_drop.rb

@@ -51,7 +51,17 @@ module Lutaml
       end
 
       def absolute_path
-        "#{@options[:absolute_path]}::#{name}"
+        absolute_path_arr = [@model.name]
+        e = find_upper_level_packaged_element(@model.id)
+        absolute_path_arr << e.name if e
+
+        while e
+          e = find_upper_level_packaged_element(e.id)
+          absolute_path_arr << e.name if e
+        end
+
+        absolute_path_arr << "::#{@xmi_root_model.model.name}"
+        absolute_path_arr.reverse.join("::")
       end
 
       def package
@@ -170,7 +180,7 @@ module Lutaml
 
       def generalization
         if @options[:with_gen] && @model.type?("uml:Class")
-          generalization = serialize_generalization(@model)
+          generalization = serialize_generalization(@model, @options)
           return {} if generalization.nil?
 
           ::Lutaml::XMI::GeneralizationDrop.new(
@@ -181,7 +191,8 @@ module Lutaml
 
       def upper_packaged_element
         if @options[:with_gen]
-          find_upper_level_packaged_element(@model.id)
+          e = find_upper_level_packaged_element(@model.id)
+          e&.name
         end
       end
 

data/lib/lutaml/xmi/liquid_drops/package_drop.rb

@@ -40,7 +40,17 @@ module Lutaml
       end
 
       def absolute_path
-        "#{@options[:absolute_path]}::#{name}"
+        absolute_path_arr = [@model.name]
+        e = find_upper_level_packaged_element(@model.id)
+        absolute_path_arr << e.name if e
+
+        while e
+          e = find_upper_level_packaged_element(e.id)
+          absolute_path_arr << e.name if e
+        end
+
+        absolute_path_arr << "::#{@xmi_root_model.model.name}"
+        absolute_path_arr.reverse.join("::")
       end
 
       def klasses # rubocop:disable Metrics/MethodLength

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

@@ -135,14 +135,12 @@ module Lutaml
           end
 
           klasses.map do |klass|
-            h = build_klass_hash(
+            build_klass_hash(
               klass, model,
-              with_gen: with_gen
+              with_gen: with_gen,
+              with_absolute_path: with_absolute_path,
+              absolute_path: absolute_path
             )
-
-            h[:absolute_path] = absolute_path if with_absolute_path
-
-            h
           end
         end
 
@@ -176,12 +174,11 @@ module Lutaml
           if klass.generalization && !klass.generalization.empty?
             klass_hash[:association_generalization] = []
             klass.generalization.each do |gen|
-              association_generalization_hash = {}
-              association_generalization_hash[:id] = gen.id
-              association_generalization_hash[:type] = gen.type
-              association_generalization_hash[:general] = gen.general
-              klass_hash[:association_generalization] <<
-                association_generalization_hash
+              klass_hash[:association_generalization] << {
+                id: gen.id,
+                type: gen.type,
+                general: gen.general,
+              }
             end
           end
 
@@ -190,12 +187,14 @@ module Lutaml
 
         # @param klass [Lutaml::Model::Serializable]
         # # @return [Hash]
-        def serialize_generalization(klass)
-          general_hash, next_general_node_id = get_top_level_general_hash(klass)
+        def serialize_generalization(klass, options = {})
+          general_hash, next_general_node_id = get_top_level_general_hash(
+            klass, options
+          )
           return general_hash unless next_general_node_id
 
           general_hash[:general] = serialize_generalization_attributes(
-            next_general_node_id,
+            next_general_node_id, options
           )
 
           general_hash
@@ -203,59 +202,38 @@ module Lutaml
 
         # @param klass [Lutaml::Model::Serializable]
         # @return [Array<Hash>]
-        def get_top_level_general_hash(klass) # rubocop:disable Metrics/AbcSize
-          general_hash, next_general_node_id = get_general_hash(klass.id)
+        def get_top_level_general_hash(klass, options = {}) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          general_hash, next_general_node_id = get_general_hash(
+            klass.id, options
+          )
           general_hash[:name] = klass.name
           general_hash[:type] = klass.type
-          general_hash[:definition] = lookup_general_documentation(klass.id)
+          general_hash[:definition] =
+            lookup_element_prop_documentation(klass.id)
           general_hash[:stereotype] = doc_node_attribute_value(
             klass.id, "stereotype"
           )
 
-          # update_inherited_attributes(general_hash)
-          # update_gen_attributes(general_hash)
-
           [general_hash, next_general_node_id]
         end
 
-        def lookup_general_documentation(klass_id)
-          # lookup_attribute_documentation(klass_id) ||
-          #   lookup_element_prop_documentation(klass_id)
-
-          lookup_element_prop_documentation(klass_id)
-        end
-
-        def update_gen_attributes(general_hash)
-          general_hash[:gen_attributes] = serialize_gen_attributes
-        end
-
-        def update_inherited_attributes(general_hash)
-          general_hash[:gml_attributes] = serialize_gml_attributes
-          general_hash[:core_attributes] = serialize_core_attributes
-        end
-
         # @param xmi_id [String]
         # @param model [Lutaml::Model::Serializable]
         # @return [Array<Hash>]
         # @note get generalization node and its owned attributes
-        def serialize_generalization_attributes(general_id)
-          general_hash, next_general_node_id = get_general_hash(general_id)
+        def serialize_generalization_attributes(general_id, options = {}) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          general_hash, next_general_node_id = get_general_hash(general_id,
+                                                                options)
 
           if next_general_node_id
             general_hash[:general] = serialize_generalization_attributes(
-              next_general_node_id,
+              next_general_node_id, options
             )
           end
 
           general_hash
         end
 
-        # @param xmi_id [String]
-        # @return [Lutaml::Model::Serializable]
-        def get_general_node(xmi_id)
-          find_packaged_element_by_id(xmi_id)
-        end
-
         # @param general_node [Lutaml::Model::Serializable]
         # @return [Hash]
         def get_general_attributes(general_node)
@@ -270,8 +248,8 @@ module Lutaml
 
         # @param general_id [String]
         # @return [Array<Hash>]
-        def get_general_hash(general_id)
-          general_node = get_general_node(general_id)
+        def get_general_hash(general_id, options = {}) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          general_node = find_packaged_element_by_id(general_id)
           return [] unless general_node
 
           general_node_attrs = get_general_attributes(general_node)
@@ -283,7 +261,8 @@ module Lutaml
               general_id: general_id,
               general_name: general_node.name,
               general_attributes: general_node_attrs,
-              general_upper_klass: general_upper_klass,
+              general_upper_klass: ::Lutaml::XMI::PackageDrop
+                .new(general_upper_klass, nil, options),
               general: {},
             },
             next_general_node_id,
@@ -350,7 +329,7 @@ module Lutaml
 
           all_packaged_elements.each do |e|
             e.packaged_element.each do |pe|
-              @upper_level_cache[pe.id] = e.name
+              @upper_level_cache[pe.id] = e
             end
           end
         end
@@ -447,25 +426,25 @@ module Lutaml
         # @return [Lutaml::Model::Serializable]
         def select_dependencies_by_client(client_id)
           all_packaged_elements.select do |e|
-            e.client == client_id &&
-              e.type?("uml:Dependency")
+            e.client == client_id && e.type?("uml:Dependency")
           end
         end
 
         # @param name [String]
         # @return [Lutaml::Model::Serializable]
         def find_packaged_element_by_name(name)
-          all_packaged_elements.find do |e|
-            e.name == name
-          end
+          all_packaged_elements.find { |e| e.name == name }
         end
 
         # @param package [Lutaml::Model::Serializable]
         # @return [Array<Hash>]
         # @note xpath ./packagedElement[@xmi:type="uml:Enumeration"]
-        def serialize_model_enums(package)
-          package.packaged_element.select { |e| e.type?("uml:Enumeration") }
-            .map do |enum|
+        def serialize_model_enums(package) # rubocop:disable Metrics/MethodLength
+          enums = package.packaged_element.select do |e|
+            e.type?("uml:Enumeration")
+          end
+
+          enums.map do |enum|
             {
               xmi_id: enum.id,
               name: enum.name,
@@ -501,8 +480,9 @@ module Lutaml
         # @note xpath ./packagedElement[@xmi:type="uml:DataType"]
         def serialize_model_data_types(model) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           all_data_type_elements = []
-          select_all_packaged_elements(all_data_type_elements, model,
-                                       "uml:DataType")
+          select_all_packaged_elements(
+            all_data_type_elements, model, "uml:DataType"
+          )
           all_data_type_elements.map do |klass|
             {
               xmi_id: klass.id,
@@ -840,8 +820,11 @@ module Lutaml
         # @return [Array<Hash>]
         # @note xpath .//ownedAttribute[@xmi:type="uml:Property"]
         def serialize_class_attributes(klass, with_assoc: false) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
-          klass.owned_attribute.select { |attr| attr.type?("uml:Property") }
-            .map do |oa|
+          owned_attributes = klass.owned_attribute.select do |attr|
+            attr.type?("uml:Property")
+          end
+
+          owned_attributes.map do |oa|
             if with_assoc || oa.association.nil?
               attrs = build_class_attributes(oa)
 
@@ -861,44 +844,6 @@ module Lutaml
           connector&.documentation&.value
         end
 
-        # @return [Array<Hash>]
-        def serialize_gml_attributes
-          element = find_packaged_element_by_name("_Feature")
-          attrs = serialize_class_attributes(element, with_assoc: true)
-          attrs.each { |attr| attr[:upper_klass] = "gml" }
-        end
-
-        # @return [Array<Hash>]
-        def serialize_core_attributes
-          element = find_packaged_element_by_name("_CityObject")
-          attrs = serialize_class_attributes(element, with_assoc: false)
-          attrs.each { |attr| attr[:upper_klass] = "core" }
-        end
-
-        # @return [Array<Hash>]
-        def select_gen_attributes
-          element = find_packaged_element_by_name("gen")
-          gen_attr_element = find_packaged_element_by_name("_genericAttribute")
-
-          element.packaged_element.select do |e|
-            e.type?("uml:Class") &&
-              e.generalization&.first&.general == gen_attr_element.id
-          end
-        end
-
-        # @return [Array<Hash>]
-        def serialize_gen_attributes
-          klasses = select_gen_attributes
-
-          klasses.map do |klass|
-            attr = serialize_class_attributes(klass, with_assoc: false)
-            attr.first[:name] = klass.name
-            attr.first[:type] = "gen:#{klass.name}"
-            attr.first[:upper_klass] = "gen"
-            attr
-          end.flatten!
-        end
-
         # @param type [String]
         # @return [String]
         def get_ns_by_type(type)
@@ -907,7 +852,7 @@ module Lutaml
           p = find_klass_packaged_element_by_name(type)
           return unless p
 
-          find_upper_level_packaged_element(p.id)
+          find_upper_level_packaged_element(p.id)&.name
         end
 
         # @param xmi_id [String]
@@ -918,7 +863,7 @@ module Lutaml
           p = find_packaged_element_by_id(xmi_id)
           return unless p
 
-          find_upper_level_packaged_element(p.id)
+          find_upper_level_packaged_element(p.id)&.name
         end
 
         # @param klass_id [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.42
+  version: 0.9.43
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-03 00:00:00.000000000 Z
+date: 2025-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir