lutaml 0.9.33 → 0.9.35

data/lib/lutaml/uml/actor.rb

@@ -7,7 +7,7 @@
 module Lutaml
   module Uml
     class Actor < Classifier
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @name = nil
         @xmi_id = nil
         @stereotype = []

data/lib/lutaml/uml/association.rb

@@ -19,24 +19,24 @@ module Lutaml
                     :action
 
       # TODO: move to Parslet::Transform
-      def members=(value)
+      def members=(value) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
         value.group_by { |member| member.keys.first }
           .each do |(type, group)|
-            if %w[owner_end member_end].include?(type)
+            if %w[owner_end member_end].include?(type) # rubocop:disable Performance/CollectionLiteralInLoop
               group.each do |member|
                 member.each_pair do |key, member_value|
-                  public_send(:"#{associtaion_type(key)}=", member_value)
+                  public_send(:"#{association_type(key)}=", member_value)
                 end
               end
               next
             end
             attribute_value = group.map(&:values).flatten
             if attribute_value.length == 1 && !attribute_value.first.is_a?(Hash)
-              next public_send(:"#{associtaion_type(type)}=",
+              next public_send(:"#{association_type(type)}=",
                                attribute_value.first)
             end
 
-            public_send(:"#{associtaion_type(type)}=", attribute_value)
+            public_send(:"#{association_type(type)}=", attribute_value)
           end
       end
     end

data/lib/lutaml/uml/connector.rb

@@ -8,7 +8,7 @@ module Lutaml
     class Connector < TopElement
       attr_accessor :kind, :connector_end
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @name = nil
         @xmi_id = nil
         @xmi_uuid = nil

data/lib/lutaml/uml/constructor_end.rb

@@ -8,7 +8,7 @@ module Lutaml
     class ConnectorEnd < TopElement
       attr_accessor :role, :part_with_port, :connector
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @role = nil
       end
     end

data/lib/lutaml/uml/dependency.rb

@@ -8,7 +8,7 @@ module Lutaml
     class Dependency < TopElement
       attr_accessor :client, :supplier
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @name = nil
         @xmi_id = nil
         @xmi_uuid = nil

data/lib/lutaml/uml/document.rb

@@ -20,7 +20,6 @@ module Lutaml
                     :fidelity,
                     :fontname,
                     :comments
-      attr_reader :packages
 
       # rubocop:disable Rails/ActiveRecordAliases
       def initialize(attributes = {})

data/lib/lutaml/uml/formatter/base.rb

@@ -8,7 +8,7 @@ module Lutaml
     module Formatter
       class Base
         class << self
-          def inherited(subclass)
+          def inherited(subclass) # rubocop:disable Lint/MissingSuper
             Formatter.all << subclass
           end
 
@@ -39,7 +39,7 @@ module Lutaml
           @type = value.to_s.strip.downcase.to_sym
         end
 
-        def format(node)
+        def format(node) # rubocop:disable Metrics/CyclomaticComplexity
           case node
           when Node::Field  then format_field(node)
           when Node::Method then format_method(node)

data/lib/lutaml/uml/formatter/graphviz.rb

@@ -41,7 +41,7 @@ module Lutaml
           cmapx
         ].freeze
 
-        def initialize(attributes = {})
+        def initialize(attributes = {}) # rubocop:disable Metrics/MethodLength
           super
 
           @graph = Attributes.new
@@ -88,7 +88,7 @@ module Lutaml
             .gsub("]", "]")
         end
 
-        def format_field(node)
+        def format_field(node) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           symbol = ACCESS_SYMBOLS[node.visibility]
           result = "#{symbol}#{node.name}"
           if node.type
@@ -104,7 +104,7 @@ module Lutaml
           result
         end
 
-        def format_method(node)
+        def format_method(node) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
           symbol = ACCESS_SYMBOLS[node.access]
           result = "#{symbol} #{node.name}"
           if node.arguments
@@ -130,7 +130,7 @@ module Lutaml
           %{#{graph_parent_name} -> #{graph_node_name}#{graph_attributes}}
         end
 
-        def generate_graph_relationship_attributes(node)
+        def generate_graph_relationship_attributes(node) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
           attributes = Attributes.new
           if %w[dependency realizes].include?(node.member_end_type)
             attributes["style"] = "dashed"
@@ -197,7 +197,7 @@ module Lutaml
           "#{res} #{cardinality['min']}..#{cardinality['max']}"
         end
 
-        def format_member_rows(members, hide_members)
+        def format_member_rows(members, hide_members) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
           unless !hide_members && members&.length&.positive?
             return <<~HEREDOC.chomp
               <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0">
@@ -218,7 +218,7 @@ module Lutaml
           field_table
         end
 
-        def format_class(node, hide_members)
+        def format_class(node, hide_members) # rubocop:disable Metrics/AbcSize
           name = ["<B>#{node.name}</B>"]
           name.unshift("«#{node.keyword}»") if node.keyword
           name_html = <<~HEREDOC
@@ -246,7 +246,7 @@ module Lutaml
           HEREDOC
         end
 
-        def format_document(node)
+        def format_document(node) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
           @fontname = node.fontname || DEFAULT_CLASS_FONT
           @node["fontname"] = "#{@fontname}-bold"
 
@@ -270,8 +270,8 @@ module Lutaml
           associations = node.classes.map(&:associations).compact.flatten +
             node.associations
           if node.groups
-            associations = sort_by_document_groupping(node.groups,
-                                                      associations)
+            associations = sort_by_document_grouping(node.groups,
+                                                     associations)
           end
           classes_names = node.classes.map(&:name)
           associations = associations.map do |assoc_node|
@@ -302,7 +302,7 @@ module Lutaml
 
         protected
 
-        def sort_by_document_groupping(groups, associations)
+        def sort_by_document_grouping(groups, associations) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
           result = []
           groups.each do |batch|
             batch.each do |group_name|

data/lib/lutaml/uml/has_members.rb

@@ -6,22 +6,22 @@ module Lutaml
       class UnknownMemberTypeError < StandardError; end
 
       # TODO: move to Parslet::Transform
-      def members=(value)
+      def members=(value) # rubocop:disable Metrics/AbcSize
         value.group_by { |member| member.keys.first }
           .each do |(type, group)|
             attribute_value = group.map(&:values).flatten
             if attribute_value.length == 1 && !attribute_value.first.is_a?(Hash)
-              next public_send(:"#{associtaion_type(type)}=",
+              next public_send(:"#{association_type(type)}=",
                                attribute_value.first)
             end
 
-            public_send(:"#{associtaion_type(type)}=", attribute_value)
+            public_send(:"#{association_type(type)}=", attribute_value)
           end
       end
 
       private
 
-      def associtaion_type(type)
+      def association_type(type)
         return type if respond_to?(:"#{type}=")
 
         raise(UnknownMemberTypeError, "Unknown member type: #{type}")

data/lib/lutaml/uml/instance.rb

@@ -5,7 +5,7 @@ module Lutaml
     class Instance < TopElement
       attr_accessor :classifier, :slot
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @name = nil
         @xmi_id = nil
         @xmi_uuid = nil

data/lib/lutaml/uml/model.rb

@@ -5,7 +5,7 @@ module Lutaml
     class Model < Package
       attr_accessor :viewpoint
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @contents = []
       end
     end

data/lib/lutaml/uml/node/class_node.rb

@@ -19,7 +19,7 @@ module Lutaml
           @modifier = value.to_s # TODO: Validate?
         end
 
-        def members=(value)
+        def members=(value) # rubocop:disable Metrics/MethodLength
           @members = value.to_a.map do |member|
             type       = member.to_a[0][0] # TODO: This is dumb
             attributes = member.to_a[0][1]

data/lib/lutaml/uml/operation.rb

@@ -6,8 +6,8 @@ module Lutaml
       include HasAttributes
       include HasMembers
 
-      attr_accessor :definition,
-                    :name,
+      attr_reader :definition
+      attr_accessor :name,
                     :return_type,
                     :parameter_type
 

data/lib/lutaml/uml/package.rb

@@ -6,9 +6,9 @@ module Lutaml
       include HasAttributes
 
       attr_accessor :imports, :contents
-      attr_reader :classes, :enums, :data_types, :children_packages
+      attr_reader :data_types, :children_packages
 
-      def initialize(attributes)
+      def initialize(attributes) # rubocop:disable Lint/MissingSuper
         update_attributes(attributes)
         @children_packages ||= packages.map do |pkg|
           [pkg, pkg.packages, pkg.packages.map(&:children_packages)]

data/lib/lutaml/uml/parsers/dsl.rb

@@ -74,7 +74,8 @@ module Lutaml
         rule(:spaces) { match("\s").repeat(1) }
         rule(:spaces?) { spaces.maybe }
         rule(:whitespace) do
-          (match("\s") | match("	") | match("\r?\n") | match("\r") | str(";")).repeat(1)
+          (match("\s") | match("	") | match("\r?\n") | match("\r") | str(";"))
+            .repeat(1)
         end
         rule(:whitespace?) { whitespace.maybe }
         rule(:name) { match["a-zA-Z0-9 _-"].repeat(1) }
@@ -83,7 +84,8 @@ module Lutaml
           spaces? >> str("**") >> (newline.absent? >> any).repeat.as(:comments)
         end
         rule(:comment_multiline_definition) do
-          spaces? >> str("*|") >> (str("|*").absent? >> any).repeat.as(:comments) >> whitespace? >> str("|*")
+          spaces? >> str("*|") >> (str("|*").absent? >> any)
+            .repeat.as(:comments) >> whitespace? >> str("|*")
         end
         rule(:class_name_chars) { match('(?:[a-zA-Z0-9 _-]|\:|\.)').repeat(1) }
         rule(:class_name) do
@@ -206,7 +208,7 @@ module Lutaml
 
         rule(:association_keyword) { kw_association >> spaces }
 
-        %w[owner member].each do |association_end_type|
+        %w[owner member].each do |association_end_type| # rubocop:disable Metrics/BlockLength
           rule("#{association_end_type}_cardinality") do
             spaces? >>
               str("[") >>
@@ -303,7 +305,8 @@ module Lutaml
             str("definition") >>
             whitespace? >>
             str("{") >>
-            ((str("\\") >> any) | (str("}").absent? >> any)).repeat.maybe.as(:definition) >>
+            ((str("\\") >> any) | (str("}").absent? >> any))
+              .repeat.maybe.as(:definition) >>
             str("}")
         end
 

data/lib/lutaml/uml/parsers/dsl_preprocessor.rb

@@ -38,7 +38,7 @@ module Lutaml
           line.gsub(%r{//.*}, "")
         end
 
-        def process_include_line(include_root, line)
+        def process_include_line(include_root, line) # rubocop:disable Metrics/MethodLength
           include_path_match = line.match(/^\s*include\s+(.+)/)
           return line if include_path_match.nil? || line =~ /^\s\*\*/
 
@@ -51,8 +51,11 @@ module Lutaml
             process_comment_line(line)
           end
         rescue Errno::ENOENT
-          puts("No such file or directory @ rb_sysopen - #{path_to_file}, \
-            include file paths need to be supplied relative to the main document")
+          puts(
+            "No such file or directory @ rb_sysopen - #{path_to_file}, " \
+            "include file paths need to be supplied relative to the main " \
+            "document",
+          )
         end
       end
     end

data/lib/lutaml/uml/property.rb

@@ -3,14 +3,14 @@
 module Lutaml
   module Uml
     class Property < TopElement
-      attr_accessor :type,
+      attr_accessor :type, # rubocop:disable Naming/MethodName
                     :aggregation,
                     :association,
                     :is_derived,
                     :lowerValue,
                     :upperValue
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         @name = nil
         @xmi_id = nil
         @xmi_uuid = nil
@@ -19,8 +19,8 @@ module Lutaml
         @namespace = nil
         @is_derived = false
         @visibility = "public"
-        @lowerValue = "1"
-        @upperValue = "1"
+        @lowerValue = "1" # rubocop:disable Naming/VariableName
+        @upperValue = "1" # rubocop:disable Naming/VariableName
       end
     end
   end

data/lib/lutaml/uml/top_element.rb

@@ -5,8 +5,8 @@ module Lutaml
     class TopElement
       include HasAttributes
 
+      attr_reader :definition
       attr_accessor :name,
-                    :definition,
                     :xmi_id,
                     :xmi_uuid,
                     :namespace,
@@ -24,7 +24,7 @@ module Lutaml
       end
       # rubocop:enable Rails/ActiveRecordAliases
 
-      def full_name
+      def full_name # rubocop:disable Metrics/MethodLength
         if name == nil
           return nil
         end

data/lib/lutaml/uml/top_element_attribute.rb

@@ -6,12 +6,12 @@ module Lutaml
       include HasAttributes
       include HasMembers
 
+      attr_reader :definition
       attr_accessor :name,
                     :visibility,
                     :type,
                     :id,
                     :xmi_id,
-                    :definition,
                     :contain,
                     :static,
                     :cardinality,

data/lib/lutaml/uml/value.rb

@@ -6,8 +6,8 @@ module Lutaml
       include HasAttributes
       include HasMembers
 
-      attr_accessor :definition,
-                    :name,
+      attr_reader :definition
+      attr_accessor :name,
                     :id,
                     :type
 

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.33".freeze
+  VERSION = "0.9.35".freeze
 end

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

@@ -5,7 +5,7 @@ module Lutaml
     class AssociationDrop < Liquid::Drop
       include Parsers::XMIBase
 
-      def initialize( # rubocop:disable Lint/MissingSuper,Metrics/ParameterLists
+      def initialize( # rubocop:disable Lint/MissingSuper,Metrics/ParameterLists,Metrics/MethodLength
         xmi_id:,
         member_end:,
         member_end_type:,
@@ -14,7 +14,8 @@ module Lutaml
         member_end_xmi_id:,
         owner_end:,
         owner_end_xmi_id:,
-        definition:
+        definition:,
+        options:
       )
         @xmi_id = xmi_id
         @member_end = member_end
@@ -25,6 +26,9 @@ module Lutaml
         @owner_end = owner_end
         @owner_end_xmi_id = owner_end_xmi_id
         @definition = definition
+        @options = options
+        @xmi_root_model = options[:xmi_root_model]
+        @id_name_mapping = options[:id_name_mapping]
       end
 
       def xmi_id
@@ -62,6 +66,11 @@ module Lutaml
       def definition
         @definition
       end
+
+      def connector
+        connector = fetch_connector(@xmi_id)
+        ::Lutaml::XMI::ConnectorDrop.new(connector)
+      end
     end
   end
 end

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

@@ -31,7 +31,7 @@ module Lutaml
         @uml_type_idref
       end
 
-      def is_derived # rubocop:disable Naming/PredicateName
+      def is_derived # rubocop:disable Naming/PredicateName,Naming/PredicatePrefix
         @model.is_derived
       end
 

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module XMI
+    class ConnectorDrop < 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 idref
+        @model.idref
+      end
+
+      def name
+        @model.name
+      end
+
+      def type
+        @model&.properties&.ea_type
+      end
+
+      def documentation
+        @model&.documentation&.value
+      end
+
+      def ea_type
+        @model&.properties&.ea_type
+      end
+
+      def direction
+        @model&.properties&.direction
+      end
+
+      def source
+        ::Lutaml::XMI::SourceTargetDrop.new(@model.source)
+      end
+
+      def target
+        ::Lutaml::XMI::SourceTargetDrop.new(@model.target)
+      end
+    end
+  end
+end

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

@@ -77,6 +77,7 @@ module Lutaml
               owner_end: owner_end,
               owner_end_xmi_id: xmi_id,
               definition: definition,
+              options: @options,
             )
           end
         end.compact
@@ -97,7 +98,7 @@ module Lutaml
         end
       end
 
-      def is_abstract # rubocop:disable Naming/PredicateName
+      def is_abstract # rubocop:disable Naming/PredicateName,Naming/PredicatePrefix
         doc_node_attribute_value(@model.id, "isAbstract")
       end
 

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

@@ -28,7 +28,7 @@ module Lutaml
         @attr[:xmi_id]
       end
 
-      def is_derived # rubocop:disable Naming/PredicateName
+      def is_derived # rubocop:disable Naming/PredicateName,Naming/PredicatePrefix
         @attr[:is_derived]
       end
 

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

@@ -72,9 +72,14 @@ module Lutaml
       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.association.empty? &&
+            @matched_element.links.generalization.empty?
+          )
 
-        @matched_element.links.association.map do |assoc|
+        links = @matched_element.links.association +
+          @matched_element.links.generalization
+        links.map do |assoc|
           link_member = assoc.start == xmi_id ? "end" : "start"
           link_owner_name = link_member == "start" ? "end" : "start"
 
@@ -100,6 +105,7 @@ module Lutaml
               owner_end: owner_end,
               owner_end_xmi_id: xmi_id,
               definition: definition,
+              options: @options,
             )
           end
         end.compact
@@ -143,7 +149,7 @@ module Lutaml
         !!@klass_guidance
       end
 
-      def is_abstract # rubocop:disable Naming/PredicateName
+      def is_abstract # rubocop:disable Naming/PredicateName,Naming/PredicatePrefix
         doc_node_attribute_value(@model.id, "isAbstract")
       end
 

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module XMI
+    class SourceTargetDrop < 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 idref
+        @model.idref
+      end
+
+      def name
+        @model&.role&.name
+      end
+
+      def type
+        @model&.model&.name
+      end
+
+      def documentation
+        @model&.documentation&.value
+      end
+
+      def multiplicity
+        @model&.type&.multiplicity
+      end
+    end
+  end
+end