lutaml 0.10.14 → 0.10.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69670b20b9f7eeb39ebc7fc3fa638b7f2934d077e18319af972881c3ef0522b5
-  data.tar.gz: b77ad5274ea62236961489bfef7751d7f4ca98ddcc8e4daa5cff30469d00abd8
+  metadata.gz: cb62e96e62545c49b005e89cc972bc7dfb9510dbd9867831db9b6f4ab0bbcc40
+  data.tar.gz: 3975abff3b9a8e54714a76209d5917ed1bcf291baf9dcdf405c658d211934714
 SHA512:
-  metadata.gz: d75318da9968bee531f257272a490b574c7541a264ce54283f35bea1cd4cc24314d9766ab8da589a326ea06edb7ac953b43c4c2db3579cc55dee46f0bee22f25
-  data.tar.gz: 9ab593c061dfb0983ded7744859ddf3e7214dc8e64f5808dae4f54f779bab4a772b6c5af65eb5c69d1df887b2ae52837d69e872790656e9aa444cd0f91eb77e0
+  metadata.gz: a09b2b6074e7fb3fa04d2084b16c35ac5f9c115708ac8f50efaac08b5999cd21613053df9eebe487a714c361317e4411de2ecc8d2286b8100e3fe23102854265
+  data.tar.gz: 6d6c1dd06afac86c94ba1047087914b59b95d09e11308482f90bb3b99b4b65633eb443a565200842f07ce51064b14e2441a4406f408697a8fe55ef67ce33c9eb

data/.rubocop_todo.yml

@@ -1,41 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-05-12 14:40:16 UTC using RuboCop version 1.86.1.
+# on 2026-05-13 02:18:49 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'lib/lutaml/qea/factory/association_builder.rb'
-    - 'lib/lutaml/qea/factory/generalization_builder.rb'
-    - 'lib/lutaml/uml_repository/index_builders/class_index.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/class_serializer.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/inheritance_resolver.rb'
-
-# Offense count: 158
+# Offense count: 155
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'lib/lutaml/qea/factory/generalization_builder.rb'
-    - 'lib/lutaml/uml_repository/index_builders/class_index.rb'
-    - 'lib/lutaml/uml_repository/queries/inheritance_query.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/class_serializer.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/inheritance_resolver.rb'
-
 # Offense count: 1
 Lint/BinaryOperatorWithIdenticalOperands:
   Exclude:
@@ -95,46 +72,48 @@ Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/lutaml/cli/uml/export_command.rb'
 
-# Offense count: 2
+# Offense count: 3
 Lint/UselessConstantScoping:
   Exclude:
     - 'lib/lutaml/cli/interactive_shell.rb'
+    - 'lib/lutaml/qea/factory/ea_to_uml_factory.rb'
 
-# Offense count: 33
+# Offense count: 8
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
-  Enabled: false
+  Exclude:
+    - 'lib/lutaml/cli/interactive_shell/query_commands.rb'
+    - 'lib/lutaml/qea/factory/generalization_builder.rb'
+    - 'lib/lutaml/uml_repository/exporters/markdown/class_page_builder.rb'
+    - 'lib/lutaml/uml_repository/queries/search_query.rb'
+    - 'lib/lutaml/uml_repository/static_site/serializers/class_serializer.rb'
+    - 'lib/lutaml/xmi/liquid_drops/klass_drop.rb'
 
-# Offense count: 23
+# Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
-  Enabled: false
+  Exclude:
+    - 'lib/lutaml/qea/factory/generalization_builder.rb'
+    - 'lib/lutaml/uml_repository/index_builders/association_index.rb'
+    - 'lib/lutaml/uml_repository/queries/search_query.rb'
+    - 'lib/lutaml/uml_repository/static_site/serializers/class_serializer.rb'
 
-# Offense count: 63
+# Offense count: 48
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 21
+  Max: 18
 
-# Offense count: 2
+# Offense count: 4
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 7
 
-# Offense count: 12
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
-    - 'lib/lutaml/cli/interactive_shell/navigation_commands.rb'
-    - 'lib/lutaml/converter/xmi_to_uml.rb'
-    - 'lib/lutaml/qea/factory/association_builder.rb'
     - 'lib/lutaml/qea/factory/ea_to_uml_factory.rb'
-    - 'lib/lutaml/qea/lookup_indexes.rb'
-    - 'lib/lutaml/uml_repository/index_builders/association_index.rb'
-    - 'lib/lutaml/uml_repository/repository/loader.rb'
-    - 'lib/lutaml/uml_repository/static_site/data_transformer.rb'
     - 'lib/lutaml/uml_repository/static_site/serializers/class_serializer.rb'
-    - 'lib/lutaml/uml_repository/static_site/serializers/inheritance_resolver.rb'
-    - 'lib/lutaml/xmi/parsers/xmi_connector.rb'
 
 # Offense count: 3
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
@@ -154,11 +133,10 @@ Naming/PredicateMethod:
     - 'lib/lutaml/qea/factory/document_builder.rb'
     - 'spec/lutaml/xmi/liquid_drops/nil_safety_spec.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:
   Exclude:
-    - 'lib/lutaml/xmi/parsers/xmi_connector.rb'
     - 'spec/lutaml/qea/infrastructure/table_reader_spec.rb'
     - 'spec/lutaml/uml_repository/index_builder_spec.rb'
 
@@ -327,12 +305,6 @@ Style/EvalWithLocation:
   Exclude:
     - 'spec/lutaml/cli/uml/search_command_spec.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/MultilineIfModifier:
-  Exclude:
-    - 'lib/lutaml/uml_repository/index_builders/class_index.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/PartitionInsteadOfDoubleSelect:
@@ -345,19 +317,3 @@ Style/SafeNavigationChainLength:
   Exclude:
     - 'lib/lutaml/qea/validation/attribute_validator.rb'
     - 'lib/lutaml/qea/validation/operation_validator.rb'
-
-# Offense count: 8
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiteralsInInterpolation:
-  Exclude:
-    - 'lib/lutaml/cli/interactive_shell/help_display.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'lib/lutaml/qea/factory/association_builder.rb'

data/lib/lutaml/cli/interactive_shell/export_handler.rb

@@ -13,19 +13,17 @@ module Lutaml
         }.freeze
 
         def cmd_export(args)
-          if last_results.nil? || last_results.empty?
-            puts OutputFormatter.warning("No results to export")
-            return
-          end
+          return warn_no_results if last_results.nil? || last_results.empty?
+          return warn_export_usage unless valid_export_args?(args)
 
-          if args.size < 3 || args[0] != "last"
-            puts OutputFormatter.warning("Usage: export last FORMAT FILE")
-            return
-          end
+          dispatch_export(args[1].downcase, args[2])
+        end
 
-          format = args[1].downcase
-          file_path = args[2]
+        def valid_export_args?(args)
+          args.size >= 3 && args[0] == "last"
+        end
 
+        def dispatch_export(format, file_path)
           exporter = EXPORT_FORMATS[format]
           if exporter
             public_send(exporter, file_path)
@@ -34,6 +32,14 @@ module Lutaml
           end
         end
 
+        def warn_no_results
+          puts OutputFormatter.warning("No results to export")
+        end
+
+        def warn_export_usage
+          puts OutputFormatter.warning("Usage: export last FORMAT FILE")
+        end
+
         def export_csv(file_path)
           require "csv"
 

data/lib/lutaml/cli/interactive_shell/navigation_commands.rb

@@ -95,14 +95,18 @@ module Lutaml
           return path if path.start_with?("ModelRoot")
           return current_path if path == "."
           return "ModelRoot" if path == "/"
+          return resolve_parent_path(path) if path.start_with?("../")
+          return resolve_child_path(path) if path.start_with?("./")
 
-          if path.start_with?("../")
-            resolve_parent_path(path)
-          elsif path.start_with?("./")
-            "#{current_path}::#{path[2..]}"
-          else
-            current_path == "ModelRoot" ? path : "#{current_path}::#{path}"
-          end
+          resolve_simple_path(path)
+        end
+
+        def resolve_child_path(path)
+          "#{current_path}::#{path[2..]}"
+        end
+
+        def resolve_simple_path(path)
+          current_path == "ModelRoot" ? path : "#{current_path}::#{path}"
         end
 
         private

data/lib/lutaml/cli/interactive_shell/query_commands.rb

@@ -172,8 +172,14 @@ module Lutaml
           puts ""
           puts "Name: #{cls.name}"
 
-          return unless cls.is_a?(Lutaml::Uml::Classifier) && cls.attributes && !cls.attributes.empty?
+          display_class_attributes(cls) if has_displayable_attributes?(cls)
+        end
+
+        def has_displayable_attributes?(cls)
+          cls.is_a?(Lutaml::Uml::Classifier) && cls.attributes && !cls.attributes.empty?
+        end
 
+        def display_class_attributes(cls)
           puts ""
           puts OutputFormatter.colorize("Attributes:", :yellow)
           cls.attributes.each do |attr|
@@ -188,6 +194,10 @@ module Lutaml
           puts "Name: #{pkg.name}"
           puts ""
 
+          display_package_classes(path)
+        end
+
+        def display_package_classes(path)
           classes = repository.classes_in_package(path)
           puts OutputFormatter.colorize("Classes (#{classes.size}):", :yellow)
           classes.each do |cls|

data/lib/lutaml/cli/interactive_shell.rb

@@ -88,14 +88,22 @@ module Lutaml
             deduplicate_history(input)
             execute_command(input.strip)
           rescue Interrupt
-            puts "\nUse 'exit' or 'quit' to exit the shell"
+            handle_interrupt
           rescue StandardError => e
-            puts OutputFormatter.error("Error: #{e.message}")
-            puts e.backtrace.first(3).join("\n") if ENV["DEBUG"]
+            handle_error(e)
           end
         end
       end
 
+      def handle_interrupt
+        puts "\nUse 'exit' or 'quit' to exit the shell"
+      end
+
+      def handle_error(error)
+        puts OutputFormatter.error("Error: #{error.message}")
+        puts error.backtrace.first(3).join("\n") if ENV["DEBUG"]
+      end
+
       def deduplicate_history(input)
         if Readline::HISTORY.length > 1 && Readline::HISTORY[-2] == input
           Readline::HISTORY.pop

data/lib/lutaml/cli/tree_view_formatter.rb

@@ -275,13 +275,21 @@ module Lutaml
 
       # Determine class type (class, interface, enumeration)
       def determine_class_type(klass)
-        return :enumeration if klass.class.name&.include?("Enum")
-        return :interface if klass.is_a?(Lutaml::Uml::TopElement) &&
-          Array(klass.stereotype).any? { |s| s&.downcase == "interface" }
+        return :enumeration if enumeration?(klass)
+        return :interface if interface?(klass)
 
         :class
       end
 
+      def enumeration?(klass)
+        klass.class.name&.include?("Enum")
+      end
+
+      def interface?(klass)
+        klass.is_a?(Lutaml::Uml::TopElement) &&
+          Array(klass.stereotype).any? { |s| s&.downcase == "interface" }
+      end
+
       # Find package path for a package object
       def find_package_path(repository, package)
         repository.indexes[:package_paths].each do |path, pkg|

data/lib/lutaml/converter/xmi_to_uml.rb

@@ -148,12 +148,17 @@ module Lutaml
       # Lazy-built hash index for O(1) diagram lookups by package
       # @return [Hash] Mapping of package_id => [diagrams]
       def diagram_lookup
-        @diagram_lookup ||= begin
-          idx = Hash.new { |h, k| h[k] = [] }
-          diagrams = @xmi_root_model.extension&.diagrams&.diagram || []
-          diagrams.each { |d| idx[d.model.package] << d if d.model&.package }
-          idx
-        end
+        @diagram_lookup ||= build_diagram_index
+      end
+
+      def build_diagram_index
+        idx = Hash.new { |h, k| h[k] = [] }
+        xmi_diagrams.each { |d| idx[d.model.package] << d if d.model&.package }
+        idx
+      end
+
+      def xmi_diagrams
+        @xmi_root_model.extension&.diagrams&.diagram || []
       end
 
       def create_uml_class_attributes(klass) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength

data/lib/lutaml/formatter/graphviz.rb

@@ -227,50 +227,65 @@ module Lutaml
         field_table
       end
 
-      def format_class(node, hide_members) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      def format_class(node, hide_members) # rubocop:disable Metrics/MethodLength
         name = ["<B>#{node.name}</B>"]
         name.unshift("«#{node.keyword}»") if node.keyword
-        name_html = <<~HEREDOC
-          <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0">
-            #{name.map { |n| %(<TR><TD ALIGN="CENTER">#{n}</TD></TR>) }.join('\n')}
-          </TABLE>
-        HEREDOC
+        name_html = build_name_table(name)
 
         field_table = format_member_rows(node.attributes, hide_members)
         method_table = if node.operations&.any?
                          format_member_rows(node.operations, hide_members)
                        end
-        table_body = [name_html, field_table, method_table].map do |type|
-          next if type.nil?
+        table_body = build_table_body(name_html, field_table, method_table)
+
+        <<~HEREDOC.chomp
+          <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" CELLPADDING="10">
+            #{table_body}
+          </TABLE>
+        HEREDOC
+      end
+
+      def build_name_table(name_parts)
+        <<~HEREDOC
+          <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0">
+            #{name_parts.map { |n| %(<TR><TD ALIGN="CENTER">#{n}</TD></TR>) }.join('\n')}
+          </TABLE>
+        HEREDOC
+      end
 
+      def build_table_body(name_html, field_table, method_table)
+        [name_html, field_table, method_table].compact.filter_map do |type|
           <<~TEXT
             <TR>
               <TD>#{type}</TD>
             </TR>
           TEXT
-        end
-
-        <<~HEREDOC.chomp
-          <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" CELLPADDING="10">
-            #{table_body.compact.join("\n")}
-          </TABLE>
-        HEREDOC
+        end.join("\n")
       end
 
-      def format_document(node) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+      def format_document(node)
         @fontname = node.fontname || DEFAULT_CLASS_FONT
         @node["fontname"] = "#{@fontname}-bold"
 
+        hide_members, hide_other_classes = extract_fidelity_options(node)
+        classes = format_all_classes(node, hide_members)
+        associations = build_associations(node, hide_other_classes)
+
+        build_digraph(classes, associations)
+      end
+
+      def extract_fidelity_options(node)
         if node.fidelity
-          hide_members = node.fidelity.hideMembers
-          hide_other_classes = node.fidelity.hideOtherClasses
+          [node.fidelity.hideMembers, node.fidelity.hideOtherClasses]
+        else
+          [nil, nil]
         end
-        classes = (node.classes +
-                    node.enums +
-                    node.data_types +
-                    node.primitives).map do |class_node|
-          graph_node_name = generate_graph_name(class_node.name)
+      end
 
+      def format_all_classes(node, hide_members)
+        all_classes = node.classes + node.enums + node.data_types + node.primitives
+        all_classes.map do |class_node|
+          graph_node_name = generate_graph_name(class_node.name)
           <<~HEREDOC
             #{graph_node_name} [
               shape="plain"
@@ -278,25 +293,36 @@ module Lutaml
               label=<#{format_class(class_node, hide_members)}>]
           HEREDOC
         end.join("\n")
-        associations = node.classes.filter_map(&:associations).flatten +
-          node.associations
+      end
+
+      def build_associations(node, hide_other_classes)
+        associations = collect_all_associations(node)
         if node.groups
           associations = sort_by_document_grouping(node.groups,
                                                    associations)
         end
+
         classes_names = node.classes.map(&:name)
-        associations = associations.map do |assoc_node|
-          if hide_other_classes &&
-              !classes_names.include?(assoc_node.member_end)
-            next
-          end
+        format_filtered_associations(associations, classes_names,
+                                     hide_other_classes)
+      end
+
+      def collect_all_associations(node)
+        node.classes.filter_map(&:associations).flatten + node.associations
+      end
+
+      def format_filtered_associations(associations, classes_names,
+hide_other_classes)
+        associations.filter_map do |assoc_node|
+          next if hide_other_classes && !classes_names.include?(assoc_node.member_end)
 
           format_relationship(assoc_node)
         end.join("\n")
+      end
 
-        classes = classes.lines.map { |line| "  #{line}" }.join.chomp
-        associations = associations
-          .lines.map { |line| "  #{line}" }.join.chomp
+      def build_digraph(classes, associations)
+        indented_classes = indent_lines(classes)
+        indented_assocs = indent_lines(associations)
 
         <<~HEREDOC
           digraph G {
@@ -304,13 +330,17 @@ module Lutaml
             edge [#{@edge}]
             node [#{@node}]
 
-          #{classes}
+          #{indented_classes}
 
-          #{associations}
+          #{indented_assocs}
           }
         HEREDOC
       end
 
+      def indent_lines(text)
+        text.lines.map { |line| "  #{line}" }.join.chomp
+      end
+
       protected
 
       def sort_by_document_grouping(groups, associations) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity

data/lib/lutaml/model_transformations/parsers/base_parser.rb

@@ -55,7 +55,7 @@ module Lutaml
         # @param file_path [String] Path to the model file
         # @return [Lutaml::Uml::Document] Parsed UML document
         # @raise [ParseError] if parsing fails
-        def parse(file_path) # rubocop:disable Metrics/MethodLength
+        def parse(file_path)
           start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           @stats_mutex.synchronize { @parse_stats[:total_parses] += 1 }
           parse_succeeded = false
@@ -65,37 +65,35 @@ module Lutaml
             validate_file!(file_path) if should_validate_input?
             clear_errors_and_warnings
 
-            begin
-              # Pre-parsing hook
-              before_parse(file_path)
-
-              # Core parsing (implemented by subclasses)
-              document = parse_internal(file_path)
+            parse_succeeded, result = execute_parse(file_path)
+            parse_handled = !parse_succeeded
+            result
+          ensure
+            record_parse_stats(parse_succeeded, parse_handled, start_time)
+          end
+        end
 
-              # Post-parsing processing
-              document = after_parse(document, file_path)
+        def execute_parse(file_path)
+          before_parse(file_path)
+          document = parse_internal(file_path)
+          document = after_parse(document, file_path)
+          validate_output!(document) if should_validate_output?
 
-              # Validate output if requested
-              validate_output!(document) if should_validate_output?
+          @stats_mutex.synchronize { @parse_stats[:successful_parses] += 1 }
+          [true, document]
+        rescue StandardError => e
+          [false, handle_parsing_error(e, file_path)]
+        end
 
-              parse_succeeded = true
-              @stats_mutex.synchronize { @parse_stats[:successful_parses] += 1 }
-              document
-            rescue StandardError => e
-              parse_handled = true
-              @stats_mutex.synchronize { @parse_stats[:failed_parses] += 1 }
-              handle_parsing_error(e, file_path)
-            end
-          ensure
-            unless parse_succeeded || parse_handled
-              @stats_mutex.synchronize { @parse_stats[:failed_parses] += 1 }
-            end
-            duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time
-            @last_duration = duration
-            @stats_mutex.synchronize do
-              @parse_stats[:total_duration] += duration
-              @parse_stats[:durations] << duration
-            end
+        def record_parse_stats(succeeded, handled, start_time)
+          unless succeeded || handled
+            @stats_mutex.synchronize { @parse_stats[:failed_parses] += 1 }
+          end
+          duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time
+          @last_duration = duration
+          @stats_mutex.synchronize do
+            @parse_stats[:total_duration] += duration
+            @parse_stats[:durations] << duration
           end
         end