lutaml 0.9.36 → 0.9.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89457333a301467b7b779044768839ced4368dc776bbf15884c41195ebf5b03b
-  data.tar.gz: 70ec7f5731d26c39761dcf7c0c3958e5213077a418c4434127b9b61d297769a9
+  metadata.gz: f12410a33e4b17ab05b04f225dfc29f02c166593e11f60eb18855377c34f0045
+  data.tar.gz: 3eea93807b6903d9ac1542a9d6dcac3f02e1ebb5cb6a53dcc8e0323343167782
 SHA512:
-  metadata.gz: 8eb4996362ac98e3a455c7f2ac308913b36b0b0382db1b9e5793a9a41cddbd720afbcee9fb0e7095bf4f3b27a744a6a8405d0cd3aadbd822f367759dad4271c6
-  data.tar.gz: 4e82993d6e01180f78299a80879bdab789a335163bdf671a46115791fbc24de90074eabc33b822c763ec9908bf1bf52c9b0ba7a36dffd0bd27b9da572571113a
+  metadata.gz: 93f8ef8383797613ba709e08a4d7b17b9f89a13a2fea1232987116add58d7fdad7c0eca0665d749a02a8a2052d32164a2c24bf6b281e3ba6493f779ced3cdc70
+  data.tar.gz: 2db73837b21c95b8a7d53820ce43dd32577ca2ea825a964adf8422138eb0fe9afb2445678937a8370d03ad4278cdb8ebd8f00fd7123a939151d2ef855c5f2719

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.36".freeze
+  VERSION = "0.9.38".freeze
 end

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

@@ -55,11 +55,22 @@ module Lutaml
         end
       end
 
+      def association_connector
+        connector = fetch_connector(@model.association)
+        if connector
+          ::Lutaml::XMI::ConnectorDrop.new(connector, @options)
+        end
+      end
+
       def type_ns
         if @options[:with_assoc] && @model.association
           get_ns_by_xmi_id(xmi_id)
         end
       end
+
+      def stereotype
+        doc_node_attribute_value(@uml_type_idref, "stereotype")
+      end
     end
   end
 end

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

@@ -37,11 +37,11 @@ module Lutaml
       end
 
       def source
-        ::Lutaml::XMI::SourceTargetDrop.new(@model.source)
+        ::Lutaml::XMI::SourceTargetDrop.new(@model.source, @options)
       end
 
       def target
-        ::Lutaml::XMI::SourceTargetDrop.new(@model.target)
+        ::Lutaml::XMI::SourceTargetDrop.new(@model.target, @options)
       end
 
       def recognized?

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

@@ -47,11 +47,14 @@ module Lutaml
       end
 
       def associations # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
-        return if !@matched_element ||
-          !@matched_element.links ||
-          @matched_element.links.association.empty?
+        return if !@matched_element || !@matched_element.links
 
-        @matched_element.links.association.map do |assoc|
+        links = []
+        @matched_element.links.each do |link|
+          links << link.association if link.association.any?
+        end
+
+        links.flatten.compact.map do |assoc|
           link_member = assoc.start == xmi_id ? "end" : "start"
           link_owner_name = link_member == "start" ? "end" : "start"
 

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module XMI
+    class DependencyDrop < Liquid::Drop
+      include Parsers::XMIBase
+
+      def initialize(model, options = {}) # rubocop:disable Lint/MissingSuper
+        @model = model
+        @options = options
+        @xmi_root_model = options[:xmi_root_model]
+        @id_name_mapping = options[:id_name_mapping]
+      end
+
+      def id
+        @model.id
+      end
+
+      def name
+        @model.name
+      end
+
+      def ea_type
+        @model&.properties&.ea_type
+      end
+
+      def documentation
+        @model&.documentation&.value
+      end
+
+      def connector
+        connector = fetch_connector(@model.id)
+        ::Lutaml::XMI::ConnectorDrop.new(connector, @options)
+      end
+    end
+  end
+end

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

@@ -37,6 +37,17 @@ module Lutaml
       def stereotype
         doc_node_attribute_value(@model.id, "stereotype")
       end
+
+      # @return name of the upper packaged element
+      def upper_packaged_element
+        if @options[:with_gen]
+          find_upper_level_packaged_element(@model.id)
+        end
+      end
+
+      def subtype_of
+        find_subtype_of(@model.id)
+      end
     end
   end
 end

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

@@ -24,6 +24,14 @@ module Lutaml
           @matched_element = @xmi_root_model&.extension&.elements&.element&.find do |e| # rubocop:disable Layout/LineLength,Style/SafeNavigationChainLength
             e.idref == @model.id
           end
+
+          @dependencies = select_dependencies_by_supplier(@model.id)
+
+          @inheritance_ids = @matched_element&.links&.map do |link|
+            link.generalization.select do |gen|
+              gen.end == @model.id
+            end.map(&:id)
+          end&.flatten&.compact || []
         end
 
         if guidance
@@ -69,17 +77,36 @@ module Lutaml
         end.compact
       end
 
+      def owned_attributes
+        @owned_attributes.map do |owned_attr|
+          ::Lutaml::XMI::AttributeDrop.new(owned_attr, @options)
+        end.compact
+      end
+
+      def dependencies
+        @dependencies.map do |dependency|
+          ::Lutaml::XMI::DependencyDrop.new(dependency, @options)
+        end.compact
+      end
+
+      def inheritances
+        @inheritance_ids.map do |inheritance_id|
+          # ::Lutaml::XMI::InheritanceDrop.new(dependency, @options)
+          connector = fetch_connector(inheritance_id)
+          ::Lutaml::XMI::ConnectorDrop.new(connector, @options)
+        end.compact
+      end
+
       def associations # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
-        return if !@matched_element ||
-          !@matched_element.links ||
-          (
-            @matched_element.links.association.empty? &&
-            @matched_element.links.generalization.empty?
-          )
+        return if !@matched_element || !@matched_element.links
+
+        links = []
+        @matched_element.links.each do |link|
+          links << link.association if link.association.any?
+          links << link.generalization if link.generalization.any?
+        end
 
-        links = @matched_element.links.association +
-          @matched_element.links.generalization
-        links.map do |assoc|
+        links.flatten.compact.map do |assoc|
           link_member = assoc.start == xmi_id ? "end" : "start"
           link_owner_name = link_member == "start" ? "end" : "start"
 
@@ -145,6 +172,16 @@ module Lutaml
         end
       end
 
+      def upper_packaged_element
+        if @options[:with_gen]
+          find_upper_level_packaged_element(@model.id)
+        end
+      end
+
+      def subtype_of
+        find_subtype_of(@model.id)
+      end
+
       def has_guidance?
         !!@klass_guidance
       end

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

@@ -31,6 +31,14 @@ module Lutaml
       def multiplicity
         @model&.type&.multiplicity
       end
+
+      def aggregation
+        @model&.type&.aggregation
+      end
+
+      def stereotype
+        doc_node_attribute_value(@model.idref, "stereotype")
+      end
     end
   end
 end

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

@@ -297,6 +297,23 @@ module Lutaml
           @upper_level_cache[klass_id]
         end
 
+        def find_subtype_of(id) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+          @pkg_elements_owned_attributes ||= all_packaged_elements.map do |e|
+            {
+              name: e.name,
+              idrefs: e&.owned_attribute&.map do |oa|
+                        oa&.uml_type&.idref
+                      end || [],
+            }
+          end
+
+          result = @pkg_elements_owned_attributes.find do |e|
+            e[:idrefs].include?(id)
+          end
+
+          result[:name] if result
+        end
+
         # Build cache once for all packaged elements
         def build_upper_level_cache
           @upper_level_cache = {}
@@ -371,7 +388,28 @@ module Lutaml
         # @return [Lutaml::Model::Serializable]
         def find_klass_packaged_element_by_name(name)
           all_packaged_elements.find do |e|
-            e.type?("uml:Class") && e.name == name
+            e.name == name &&
+              (
+                e.type?("uml:Class") ||
+                e.type?("uml:AssociationClass")
+              )
+          end
+        end
+
+        # @param name [String]
+        # @return [Lutaml::Model::Serializable]
+        def find_enum_packaged_element_by_name(name)
+          all_packaged_elements.find do |e|
+            e.name == name && e.type?("uml:Enumeration")
+          end
+        end
+
+        # @param supplier_id [String]
+        # @return [Lutaml::Model::Serializable]
+        def select_dependencies_by_supplier(supplier_id)
+          all_packaged_elements.select do |e|
+            e.supplier == supplier_id &&
+              e.type?("uml:Dependency")
           end
         end
 
@@ -473,11 +511,14 @@ module Lutaml
           matched_element = @xmi_root_model.extension.elements.element
             .find { |e| e.idref == xmi_id }
 
-          return if !matched_element ||
-            !matched_element.links ||
-            matched_element.links.association.empty?
+          return if !matched_element || !matched_element.links
+
+          links = []
+          matched_element.links.each do |link|
+            links << link.association if link.association.any?
+          end
 
-          matched_element.links.association.map do |assoc|
+          links.flatten.compact.map do |assoc|
             link_member = assoc.start == xmi_id ? "end" : "start"
             linke_owner_name = link_member == "start" ? "end" : "start"
 

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

@@ -67,6 +67,30 @@ module Lutaml
 
             ret_val
           end
+
+          # @param xmi_path [String] path to xml
+          # @param name [String]
+          # @return [Hash]
+          def serialize_enumeration_by_name( # rubocop:disable Metrics/MethodLength
+            xmi_path, name
+          )
+            # Load from cache or file
+            xml_cache_key = (Digest::SHA256.file xmi_path).hexdigest
+            xmi_model = @xmi_root_model_cache_static[xml_cache_key] ||
+              get_xmi_model(xmi_path)
+            id_name_mapping = @id_name_mapping_static[xml_cache_key]
+
+            instance = new
+            enum = instance.serialize_enumeration_by_name(
+              xmi_model, name, id_name_mapping
+            )
+
+            # Put xmi_model and id_name_mapping to cache
+            @id_name_mapping_static[xml_cache_key] ||= instance.id_name_mapping
+            @xmi_root_model_cache_static[xml_cache_key] ||= xmi_model
+
+            enum
+          end
         end
 
         # @param xmi_model [Lutaml::Model::Serializable]
@@ -122,12 +146,32 @@ module Lutaml
             with_gen: true,
             with_absolute_path: true,
           }
+          puts "Error: Class not found for name: #{name}!" if klass.nil?
           ::Lutaml::XMI::KlassDrop.new(
             klass,
             guidance,
             options,
           )
         end
+
+        # @param xmi_model [Lutaml::Model::Serializable]
+        # @param name [String]
+        # @param id_name_mapping [Hash]
+        # @return [Hash]
+        def serialize_enumeration_by_name( # rubocop:disable Metrics/MethodLength
+          xmi_model, name, id_name_mapping = nil
+        )
+          set_xmi_model(xmi_model, id_name_mapping)
+          enum = find_enum_packaged_element_by_name(name)
+          options = {
+            xmi_root_model: @xmi_root_model,
+            id_name_mapping: @id_name_mapping,
+            with_gen: true,
+            with_absolute_path: true,
+          }
+          puts "Error: Enumeration not found for name: #{name}!" if enum.nil?
+          ::Lutaml::XMI::EnumDrop.new(enum, options)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.36
+  version: 0.9.38
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-30 00:00:00.000000000 Z
+date: 2025-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -314,6 +314,7 @@ files:
 - lib/lutaml/xmi/liquid_drops/connector_drop.rb
 - lib/lutaml/xmi/liquid_drops/constraint_drop.rb
 - lib/lutaml/xmi/liquid_drops/data_type_drop.rb
+- lib/lutaml/xmi/liquid_drops/dependency_drop.rb
 - lib/lutaml/xmi/liquid_drops/diagram_drop.rb
 - lib/lutaml/xmi/liquid_drops/enum_drop.rb
 - lib/lutaml/xmi/liquid_drops/enum_owned_literal_drop.rb