xumlidot 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57e014e5a04129a7ca8bfcc0cc8dae7e2b4db752de4bf5ad7643db37251de91
-  data.tar.gz: 5fa6e4b9c7004a2078a12123d5d506bd2d6479271285cd868fb87ba61a67b319
+  metadata.gz: '08c6d11a210e378f99226f1933944c6023d2bb3b0b5a8eeaba85050fe6e8b3cb'
+  data.tar.gz: d8a37ae51f5d1dbc416d05241b456e614f56f82d23b972d9a8e1507dc84835d1
 SHA512:
-  metadata.gz: e3dc0e126cb359825379197fb3537881156436db6b65667c2c96cbfe31468e1ad406e78c485125ee334236cd7c9b018e717fd9a2dc29136b376b544adbbff537
-  data.tar.gz: 5d7f6a45fdd7b7f847581991b67e4dee05b0c3aa518ce176c886d898a19a59e729f0d9f3e122ab09dbbf66e2af62c673f122819fa75e6149c315adb3a5f3997f
+  metadata.gz: bae461d270a21d92c15ff2694b955fc1972e43d6b973da8620032d96533bbfcb02c426793286a0a044b1eeb2f6a01c072e19bb2184a7c1908f596df3f7e6532c
+  data.tar.gz: '08f435ea1c0dddbcf49c53ab6c18820a6aceb67d2f504cbbe315203f9ea9f465dd1c378384bd70abe1202c83aede6f64793f0a7840a321af1052696bf477d203'

data/bin/xumlidot

@@ -5,35 +5,6 @@ require_relative '../lib/xumlidot'
 options = ::Xumlidot::Options.parse(ARGV)
 
 # TODO: user input
-directories = [ARGV[0]]
+directories = ARGV
 
-dt = Xumlidot::DirectoryTree.new(directories, options)
-
-# This is our tree of klasses/modules etc
-# since we can't assume rails conventions for naming
-# in a Ruby program.
-constants = ::Xumlidot::Parsers::Stack::Constants.new
-
-# TODO: move into directory tree
-dt.find_all_rb_files do |path|
-  STDERR.puts path if ::Xumlidot::Options.debug == true
-  file_contents = File.read(path)
-
-  @parser = Xumlidot::Parsers::File.new(file_contents, constants)
-  @parser.parse
-end
-
-# If a class is inherited from but does not exist in the constants
-# we will create a dummy class.
-#
-# if a class is inherited from, we want to find it using the constant lookup
-# rules definind in the resolver
-#
-# and what ... we want to add a reference too it?
-#
-# This REALLY should be done whenever we add a superklass
-# i.e. yeah, its a hack
-constants.resolve_inheritance()
-
-diagram = ::Xumlidot::Diagram.new(constants, options)
-diagram.draw
+::Xumlidot::Loader.new(directories, options).load

data/lib/xumlidot/diagram/dot/klass.rb

@@ -6,8 +6,16 @@ module Xumlidot
   class Diagram
     class Dot
       module Method
+        CHARACTER_SUBSTITUTIONS = {
+          '>' => '\>',
+          '<' => '\<',
+          '{' => '\{',
+          '}' => '\}',
+          '|' => '\|'
+        }.freeze
+
         def to_dot
-          to_s.gsub('{}', '\{\}')
+          to_s.gsub(/[#{CHARACTER_SUBSTITUTIONS.keys.join}]/, CHARACTER_SUBSTITUTIONS)
         end
       end
 
@@ -29,22 +37,29 @@ module Xumlidot
         end
 
         def draw_composition(composee)
-          "\"#{draw_identifier(composee.definition)}\" -> \"#{draw_identifier(@definition)}\" [label=\"\", arrowhead=\"diamond\", arrowtail=\"diamond\"]"
+          "\"#{draw_identifier(composee.definition)}\"" \
+            " -> \"#{draw_identifier(@definition)}\"" \
+            ' [label="", arrowhead="diamond", arrowtail="diamond"]'
         end
 
-        def draw_inheritence
+        def draw_inheritance # rubocop:disable Metrics/AbcSize
           return nil if @definition.superklass.empty? && @definition.inherited_modules.empty?
 
-          dot = ""
-          if !@definition.superklass.empty?
-            dot += "\"#{draw_identifier(@definition)}\" -> \"#{draw_ancestor(@definition.superklass)}\" [label=\"\", arrowhead=\"empty\", arrowtail=\"onormal\"]\n"
+          dot = ''
+          unless @definition.superklass.empty?
+            dot += "\"#{draw_identifier(@definition)}\"" \
+                   " -> \"#{draw_ancestor(@definition.superklass)}\"" \
+                   " [label=\"\", arrowhead=\"empty\", arrowtail=\"onormal\"]\n"
           end
 
           return dot if @definition.inherited_modules.empty?
 
           @definition.inherited_modules.each do |m|
             next if m.empty?
-            dot += "\"#{draw_identifier(@definition)}\" -> \"#{draw_ancestor(m)}\" [label=\"#{m.type.to_s}s\", arrowhead=\"empty\", arrowtail=\"onormal\"]\n"
+
+            dot += "\"#{draw_identifier(@definition)}\"" \
+                   " -> \"#{draw_ancestor(m)}\"" \
+                   " [label=\"#{m.type}s\", arrowhead=\"empty\", arrowtail=\"onormal\"]\n"
           end
 
           dot
@@ -52,19 +67,19 @@ module Xumlidot
 
         private
 
-        def draw_methods
+        def draw_methods # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           @attributes.each { |a| a.extend(Attribute) }
           @class_methods.each { |a| a.extend(Method) }
           @instance_methods.each { |a| a.extend(Method) }
 
           km = ''
           km += @attributes.map(&:to_dot).join('\l')
-          km += '\\l' unless km.end_with?('\\l')
+          km += '\\l' if @attributes.any?
 
           km += @class_methods.map(&:to_dot).join('\l')
           km += '\\l' unless km.end_with?('\\l')
-          km += '|' if instance_methods.size.positive?
 
+          km += '|' if instance_methods.any?
           km += @instance_methods.map(&:to_dot).join('\l')
           km += '\\l' unless km.end_with?('\\l')
           km

data/lib/xumlidot/diagram/dot.rb

@@ -1,19 +1,19 @@
+# frozen_string_literal: true
+
 require_relative 'dot/klass'
 require_relative 'dot/module'
 
 module Xumlidot
   class Diagram
     class Dot
-
-      def initialize(stack, options = nil)
+      def initialize(stack)
         @stack = stack
-        @options = options
         @output = []
       end
 
       # We have to draw any connecting labels AFTER we have drawn the klasses
       # in order to have something to connect.
-      def draw
+      def draw # rubocop:disable Metrics/AbcSize
         @output << header
         @stack.traverse do |klass|
           klass.extend(::Xumlidot::Diagram::Dot::Klass)
@@ -21,15 +21,15 @@ module Xumlidot
         end
 
         @stack.traverse do |klass|
-          # Check - i shouldnt need to extend twice
+          # Check - i shouldn't need to extend twice
           klass.extend(::Xumlidot::Diagram::Dot::Klass)
 
-          if @options.inheritance
-            output = klass.draw_inheritence
+          if ::Xumlidot::Options.inheritance
+            output = klass.draw_inheritance
             @output << output unless output.nil?
           end
 
-          if @options.composition
+          if ::Xumlidot::Options.composition
             klass.constants.each do |k|
               @output << klass.draw_composition(k)
             end

data/lib/xumlidot/diagram/shared/naming.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
 module Xumlidot
   class Diagram
     module Shared
       module Naming
-        def draw_identifier(d = @definition)
-          [d.name.name, d.name.namespace.reverse].reverse.flatten.join('::')
+        def draw_identifier(definition = @definition)
+          [definition.name.name, definition.name.namespace.reverse].reverse.flatten.join('::')
         end
 
         def draw_name
           @definition.name.name.join('::')
         end
 
-        def draw_ancestor(d = @definition)
-          [d.name, d.namespace.reverse].reverse.flatten.join('::')
+        def draw_ancestor(definition = @definition)
+          [definition.name, definition.namespace.reverse].reverse.flatten.join('::')
         end
       end
     end

data/lib/xumlidot/diagram/xmi/argument.rb

@@ -10,19 +10,22 @@ module Xumlidot
 
         def draw
           xmi = "<ownedParameter kind=\"inout\" name=\"#{name_to_xmi}\" xmi:id=\"#{id}\" xmi:type=\"uml:Parameter\">"
-          xmi += "<defaultValue value=\"#{default_to_xmi}\" xmi:id=\"#{default_id}\" xmi:type=\"uml:LiteralString\"/>" if default
-          xmi += "</ownedParameter>"
+          if default
+            xmi += "<defaultValue value=\"#{default_to_xmi}\" xmi:id=\"#{default_id}\" xmi:type=\"uml:LiteralString\"/>"
+          end
+          "#{xmi}</ownedParameter>"
         end
 
         private
 
         def name_to_xmi
-          name.encode(:xml => :text) if name
+          name&.encode(xml: :text)
         end
 
         def default_to_xmi
           return default unless default.is_a?(String)
-          default.encode(:xml => :text)
+
+          default.encode(xml: :text)
         end
 
         def default_id

data/lib/xumlidot/diagram/xmi/attribute.rb

@@ -8,16 +8,16 @@ module Xumlidot
       module Attribute
         include ::Xumlidot::Diagram::Xmi::ID
 
-        # TODO - public/private visibility on attributes
+        # TODO: - public/private visibility on attributes
         def draw
-          attribute_xmi = "<ownedAttribute aggregation=\"none\" isDerived=\"false\" isDerivedUnion=\"false\" isID=\"false\" isLeaf=\"false\" isReadOnly=\"false\" isStatic=\"false\" name=\"#{name_to_xmi}\" visibility=\"public\" xmi:id=\"#{id}\" xmi:type=\"uml:Property\">"
-          attribute_xmi += "</ownedAttribute>"
+          '<ownedAttribute aggregation="none" isDerived="false" isDerivedUnion="false" isID="false"' \
+            " isLeaf=\"false\" isReadOnly=\"false\" isStatic=\"false\" name=\"#{name_to_xmi}\"" \
+            " visibility=\"public\" xmi:id=\"#{id}\" xmi:type=\"uml:Property\"></ownedAttribute>"
         end
 
         def name_to_xmi
-          name.encode(:xml => :text) if name
+          name&.encode(xml: :text)
         end
-
       end
     end
   end

data/lib/xumlidot/diagram/xmi/id.rb

@@ -3,6 +3,46 @@
 require 'securerandom'
 
 module Xumlidot
+  class ID
+    class << self
+      # rubocop:disable Layout/LineLength
+      PREGENERATED = %w[ 915803defa2bd0509fc1ff7a652081d4 e891fc71118502b95030b5e15d887622 2cf60373a8305b3f64bb93a5fa0e786c 35cd5b04a0ab4542aede1e37046fab5e
+                         e1521c43130d064474e1585be1d69c6f 59975b5d607a197e676e2534e3dce454 9e52022530441f1688dfab381bba4069 f84f7b576ba1ab5929b4208cebfe7935
+                         37e5d86bb891a70011261ad861118a73 09646c77f8dfd088487c91f75c387a4c 9a064273fb75db2d41ad146063940862 ecc9ae948a23543ad23e61b0f907ae6b
+                         b922777242d6e4d182e979a19b6b8fd9 b7f1299975494da9811c061f008cacba c906375f1de4be9d3dd3ea56e7917ea6 4265f6134237c7d0c9a4f12b838d1849
+                         2d75d4762aa997551f95c76ff23a1e52 fe32489778ddc04b5b2e29a69a25c44e 8e89af98ee73225cac65ade347f5d653 70668faf589fcdd1034db5e8e38c0b8c
+                         5b4d3919edab18b46790dc2af405982e bb35181dc1d23696cb914287fb3073da 1adca3c4c42e345682e0abe24dee32fb 611e830b410e4216c80b5fb62f0f0d20
+                         648b5d6b3d87b62a3fd34620c391c6e5 bd0747fa99c86e03dd6bbeec3989f859 52653ebf9f0c0930523f583ca3a54476 52e2bdc77cba152a5f8a1e7703893b13
+                         08b98d56e4b3e9dd7415cd0174550e01 63de406c477145edb70df08e1fe3d3e9 93f7b64cbd8e96ac5b54e0b83cfef84b cae3e7e7fc79276237aecaf68ab1bdc3
+                         d2bde85b6c67f2c4e4f21f4eb24a9e11 b6239715d7b6dfbe845bf6218ffa9267 d018d840347248a3da9989cd56f10532 1fc72578fa0f6820991a2068aac595b0
+                         f200b2bf3d28ce99cadeb505fe2a13f9 aba7ec911338260e448768655f9f7f62 e5019785cc3b2db9866887002aab0e82 a9490aac41fa641bf17595f5adc014e2
+                         85917936118146692ec4ebaff9bffa25 13fe8089229ff0a7a824a11683e1afa4 8f4dcf8694457f5d09b69513034eb896 aa841e2dda7b46f397dfee83ebebfcb3
+                         e84c823e04f190a46b92c7e96d39d802 8dc5d1471bda113d37134e6e457be7f3 ee0989ea42bd2a2e06b0b923bc27aac7 b21b9efefa95229940367caa25d7c7b6
+                         7f32d97647fa4d3bb1cb0f8842f6280c 65864053fcd398271fd0482e4b8d6291 22c52a000c617293244d2346679bbcc7 f745cfcd9617f0ee9e8b7a609ccce424
+                         85ee520fa2e905d454ccdbf94d789e81 f260df13675880d30ff85dd6713b3df8 afdbe21f7540febe19e2dd2efb1770fe 9c6e6b915115f94f74777e1fe3683805
+                         8517f315cc89778e32d62b0e2ee0c01e 2303ed4f97dd09d24427400e3ed9dbaf 72549f0fe322198493927ff113bb9841 c27b2914926e6c8c7406199b0532ba00
+                         79940b95278e119378da6e15eea86a90 cd3ee7977ead372f732a8c586ea566a7 ea6370883b3de89a8b38a03c1ec9d591 92ed3a3d54ac7c28e7544ea22f6bfe97
+                         8c2302bf6185908b24798f359a2e4838 bef733b51d12963d596f5ecfd5197201 3fa6ac50361036266b73bca0ad3dee57 a5545b87d99a3b7c9533085498ff460e
+                         dc3115e7ced845fc6303b2b294a42437 027b8863405ce601db60d685af987dee 71ac366b83d49ca62c3f7c0c7c101f43 6647027529522180e0ae96a176e5766d
+                         22e2726ab1b3df71e314f8145180f1c8 b800ccd5d685adac614624ffd5abb098 6c395e62f19d0f5b04f7cea5dd616a24 e2bbe604833cc15c393450d215008306
+                         7fa0acb9786d57b2ef4d9027f6cc7992 73d5302aedef54fb51cd08173c1f1829 01cef3c8b0d5ef6cae8574d1a5044b2b c695a6a12c418bb56699b2f5c6559da3
+                         a14c60d2210dfea6e625208b72aa79e9 1c60dc02eece351995820d7436e7752e d2a2b30eecceb9f453697103b01b203a 3ae847a28c2248460a37e24686860479
+                         354982e26fd1da65403c9e70866e14f7 66485373131b4d5e02261f9d085be072 2e3e154c3ec06e401f48c7f444583d45 e57c33100b8f66813ee9265e4f023e03
+                         5afa58ca1c74f449d1b18cc3cb39b19f d5775ea87353bb12f31318533ed17382 c55778698f7c896c6f7e1a35f8698a06 178d5cdabad7e9f82f326a9ebbd01737
+                         31cf106e33c94b139f8c8c4820b46524 50a49cf6d0b9bedcbcef845917889a62 cc8aa4100a6f3855df3518a0a4474b74 c98c57ab3db339c74d44d6da5b2e0e62
+                         a04e46e4a1f5fea64b3a47a3cc8ca0de 750156c36b6990f2a4763949775ea6a1 423cb15b7efee4800449579ce561a58e 424041648b3414d67743957b9e2ad66c ].freeze
+      # rubocop:enable Layout/LineLength
+
+      def reset
+        @fixed = nil
+      end
+
+      def fixed
+        @fixed ||= PREGENERATED.dup
+      end
+    end
+  end
+
   class Diagram
     class Xmi
       # Helper - everything needs an id and these ids need to be used in the
@@ -31,7 +71,11 @@ module Xumlidot
         private
 
         def new_id
-          SecureRandom.hex
+          if ::Xumlidot::Options.use_debug_ids
+            ::Xumlidot::ID.fixed.shift
+          else
+            SecureRandom.hex
+          end
         end
       end
     end

data/lib/xumlidot/diagram/xmi/klass.rb

@@ -24,39 +24,38 @@ module Xumlidot
         end
 
         # TODO: Split this into model and diagram classes
-        class Model
-        end
-
-        class Diagram
-        end
+        # class Model
+        # end
+        # class Diagram
+        # end
 
-        def draw_klass(options)
+        def draw_klass # rubocop:disable Metrics/AbcSize
           definition.name.extend(Name)
           xmi = "<ownedMember isAbstract=\"false\" isActive=\"false\" isLeaf=\"false\" name=\"#{definition.name.to_xmi}\" visibility=\"public\" xmi:id=\"#{id}\" xmi:type=\"uml:Class\">"
-          xmi += draw_model_inheritance if options.inheritance
+          xmi += draw_model_inheritance if ::Xumlidot::Options.inheritance
           xmi += extend_and_draw(attributes)
           xmi += extend_and_draw(class_methods)
           xmi += extend_and_draw(instance_methods)
-          xmi += "</ownedMember>"
+          "#{xmi}</ownedMember>"
         end
 
         # Draws a diagram element i.e. the part which is rendered
-        def draw_diagram(options)
+        def draw_diagram
           xml = %(<uml:DiagramElement preferredShapeType="Class" subject="#{id}" xmi:id="#{id}de">
             </uml:DiagramElement>)
 
           return xml if @definition.superklass.empty? && @definition.inherited_modules.empty?
-          return xml unless options.inheritance
+          return xml unless ::Xumlidot::Options.inheritance
 
-          xml += draw_diagram_generalisation
+          xml + draw_diagram_generalisation
         end
 
         def draw_diagram_generalisation
           xml = ''
 
-          if ! @definition.superklass.empty?
+          unless @definition.superklass.empty?
             xml += %(<uml:DiagramElement fromDiagramElement="#{@definition.superklass.id}de" preferredShapeType="Generalization" subject="#{gen_id}" toDiagramElement="#{id}de">
-            </uml:DiagramElement>)
+                     </uml:DiagramElement>)
           end
 
           return xml if @definition.inherited_modules.empty?
@@ -65,7 +64,7 @@ module Xumlidot
             next if m.empty?
 
             xml += %(<uml:DiagramElement fromDiagramElement="#{m.id}de" preferredShapeType="Generalization" subject="#{gen_id}" toDiagramElement="#{id}de">
-            </uml:DiagramElement>)
+                     </uml:DiagramElement>)
           end
 
           xml
@@ -77,12 +76,12 @@ module Xumlidot
         # general =
         # id = IMPORTANT; will be used to draw the lines in the diagram
         #
-        def draw_model_inheritance
+        def draw_model_inheritance # rubocop:disable Metrics/AbcSize
           return '' if @definition.superklass.empty? && @definition.inherited_modules.empty?
 
           xml = ''
 
-          if ! @definition.superklass.empty?
+          unless @definition.superklass.empty?
             xml += %(<generalization general="#{@definition.superklass.id}" xmi:id="#{gen_id}" xmi:type="uml:Generalization">
               </generalization>)
           end
@@ -101,11 +100,11 @@ module Xumlidot
         def draw_model_composition(composee)
           %(<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="#{association_id}" xmi:type="uml:Association">
               <memberEnd xmi:idref="#{association_end_id}"/>
-              <ownedEnd aggregation="none" association="#{association_id}" isDerived="false" isDerivedUnion="false" isLeaf="false" isNavigable="true" isReadOnly="false" isStatic="false" type="#{id}" xmi:id="9JMZlYaD.AACASCI" xmi:type="uml:Property">
+              <ownedEnd aggregation="none" association="#{association_id}" isDerived="false" isDerivedUnion="false" isLeaf="false" isNavigable="true" isReadOnly="false" isStatic="false" type="#{id}" xmi:id="#{association_end_id}" xmi:type="uml:Property">
               </ownedEnd>
               <memberEnd xmi:idref="#{composee.association_end_id}"/>
-            <ownedEnd aggregation="composite" association="#{association_id}" isDerived="false" isDerivedUnion="false" isLeaf="false" isNavigable="true" isReadOnly="false" isStatic="false" type="#{composee.id}" xmi:id="9JMZlYaD.AACASCK" xmi:type="uml:Property">
-            </ownedEnd>
+              <ownedEnd aggregation="composite" association="#{association_id}" isDerived="false" isDerivedUnion="false" isLeaf="false" isNavigable="true" isReadOnly="false" isStatic="false" type="#{composee.id}" xmi:id="#{composee.association_end_id}" xmi:type="uml:Property">
+              </ownedEnd>
             </ownedMember>)
         end
 

data/lib/xumlidot/diagram/xmi/method.rb

@@ -14,17 +14,20 @@ module Xumlidot
           return '&lt;&lt;' if name == :<<
           return '&gt;&gt;' if name == :>>
           return '&lt;=&gt;' if name == :<=>
+
           name
         end
 
         def draw
-          xmi = "<ownedOperation isAbstract=\"false\" isLeaf=\"false\" isOrdered=\"false\" isQuery=\"false\" isStatic=\"#{superclass_method}\" isUnique=\"true\" name=\"#{name_to_xmi}\" visibility=\"#{visibility}\" xmi:id=\"#{id}\" xmi:type=\"uml:Operation\">"
+          xmi = '<ownedOperation isAbstract="false" isLeaf="false" isOrdered="false" isQuery="false"' \
+                " isStatic=\"#{superclass_method}\" isUnique=\"true\" name=\"#{name_to_xmi}\"" \
+                " visibility=\"#{visibility}\" xmi:id=\"#{id}\" xmi:type=\"uml:Operation\">"
           xmi += "<ownedParameter kind=\"return\" xmi:id=\"#{return_id}\" xmi:type=\"uml:Parameter\"/>"
           args.each do |argument|
             argument.extend(::Xumlidot::Diagram::Xmi::Argument)
             xmi += argument.draw
           end
-          xmi += "</ownedOperation>"
+          "#{xmi}</ownedOperation>"
         end
 
         private

data/lib/xumlidot/diagram/xmi.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'xmi/argument'
 require_relative 'xmi/attribute'
 require_relative 'xmi/klass'
@@ -8,16 +10,9 @@ require 'rexml/document'
 module Xumlidot
   class Diagram
     class Xmi
-
       include REXML
 
       class Elements < Array
-
-        def initialize(options)
-          super()
-          @options = options
-        end
-
         def draw
           xml = header
           uniq.each { |de| xml += de }
@@ -46,7 +41,7 @@ module Xumlidot
         private
 
         def header
-          %(<uml:Model name="#{@options[:model_name]}" xmi:id="jcBKnwaFYHEAAQV_">)
+          %(<uml:Model name="#{::Xumlidot::Options.model_name}" xmi:id="jcBKnwaFYHEAAQV_">)
         end
 
         def footer
@@ -58,12 +53,13 @@ module Xumlidot
         private
 
         def header
-          %(<uml:Diagram diagramType="ClassDiagram" documentation="" name="#{@options[:title]}" toolName="Visual Paradigm" xmi:id="QfZKnwaFYHEAAQj3">
-              <uml:Diagram.element>)
+          %(<uml:Diagram diagramType="ClassDiagram" documentation=""
+             name="#{::Xumlidot::Options.title}" toolName="Visual Paradigm" xmi:id="QfZKnwaFYHEAAQj3">
+            <uml:Diagram.element>)
         end
 
         def footer
-          %(  </uml:Diagram.element>
+          %(</uml:Diagram.element>
             </uml:Diagram>)
         end
       end
@@ -76,7 +72,7 @@ module Xumlidot
         end
 
         # reverse lookup
-        def has_value?(id)
+        def has_value?(id) # rubocop:disable Naming/PredicateName
           @id_to_namespace[id] != nil
         end
 
@@ -94,20 +90,19 @@ module Xumlidot
         end
       end
 
-      def initialize(stack, options = nil)
+      def initialize(stack)
         @stack = stack
-        @options = options
 
         @namespace_to_id = NamespaceToId.new
 
-        @model = ModelElements.new(options)
-        @diagram = DiagramElements.new(options)
+        @model = ModelElements.new
+        @diagram = DiagramElements.new
 
-        @model_associations = ModelAssociationElements.new(options)
-        @diagram_associations = DiagramAssociationElements.new(options)
+        @model_associations = ModelAssociationElements.new
+        @diagram_associations = DiagramAssociationElements.new
       end
 
-      def draw
+      def draw # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         # First traversal we're just assigning ids to everything so that when
         # we come to draw things we can do a lookup on the ids for any composition
         # aggregation or subclass relationships.
@@ -117,10 +112,12 @@ module Xumlidot
 
           klass.definition.inherited_modules.each do |m|
             next if m.empty?
+
             m.extend(::Xumlidot::Diagram::Xmi::Superklass)
-          end #unless klass.definition.inherited_modules.empty?
+          end
 
           next if @namespace_to_id.has?(klass.draw_identifier)
+
           @namespace_to_id[klass.draw_identifier] = klass.id
         end
 
@@ -136,22 +133,24 @@ module Xumlidot
           # do the same with the inherited modules
           klass.definition.inherited_modules.each do |m|
             next if m.empty?
+
             id = @namespace_to_id[m.draw_identifier]
             m.force_id(id)
-          end #unless klass.definition.inherited_modules.empty?
+          end
 
           # if we have not added an id for this element it is likely a duplicate
           # so do not draw it.
-          next unless @namespace_to_id.has_value?(klass.id)
+          next unless @namespace_to_id.has_value?(klass.id) # rubocop:disable Style/PreferredHashMethods
 
-          @model << klass.draw_klass(@options)
-          @diagram << klass.draw_diagram(@options)
+          @model << klass.draw_klass
+          @diagram << klass.draw_diagram
 
-          if @options.composition
+          if ::Xumlidot::Options.composition
             klass.constants.each do |k|
               # Likewise to the above, unless we have an id for the class
               # we don't want to draw the relationships
-              next unless @namespace_to_id.has_value?(k.id)
+              next unless @namespace_to_id.has_value?(k.id) # rubocop:disable Style/PreferredHashMethods
+
               @model_associations << klass.draw_model_composition(k)
               @diagram_associations << klass.draw_diagram_composition(k)
             end

data/lib/xumlidot/diagram.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require_relative 'diagram/dot'
 require_relative 'diagram/xmi'
 
 module Xumlidot
   class Diagram
-    def initialize(stack, options)
-      @diagram = if options[:diagram_type] == :dot
-                   ::Xumlidot::Diagram::Dot.new(stack, options)
+    def initialize(stack, _options)
+      @diagram = if ::Xumlidot::Options.diagram_type == :dot
+                   ::Xumlidot::Diagram::Dot.new(stack)
                  else
-                   ::Xumlidot::Diagram::Xmi.new(stack, options)
+                   ::Xumlidot::Diagram::Xmi.new(stack)
                  end
     end
 

data/lib/xumlidot/directory_tree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xumlidot
@@ -9,7 +11,7 @@ module Xumlidot
       @excluded = Regexp.new(@options.exclude)
     end
 
-    def find_all_rb_files(&block)
+    def find_all_rb_files
       @directories.each do |directory|
         Find.find(directory) do |path|
           next if path =~ @exluded

data/lib/xumlidot/loader.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Xumlidot
+  # This is code that was living in bin/xumlidot. We need to leverage
+  # it for running integration tests though
+  class Loader
+    def initialize(directories, options)
+      @directories = directories
+      @options = options
+    end
+
+    def load
+      dt = Xumlidot::DirectoryTree.new(directories, options)
+
+      # This is our tree of klasses/modules etc
+      # since we can't assume rails conventions for naming
+      # in a Ruby program.
+      constants = ::Xumlidot::Parsers::Stack::Constants.new
+
+      # TODO: move into directory tree
+      dt.find_all_rb_files do |path|
+        warn path if ::Xumlidot::Options.debug == true
+        file_contents = File.read(path)
+
+        @parser = Xumlidot::Parsers::File.new(file_contents, constants)
+        @parser.parse
+      end
+
+      # If a class is inherited from but does not exist in the constants
+      # we will create a dummy class.
+      #
+      # if a class is inherited from, we want to find it using the constant lookup
+      # rules defining in the resolver
+      #
+      # and what ... we want to add a reference too it?
+      #
+      # This REALLY should be done whenever we add a superklass
+      # i.e. yeah, its a hack
+      constants.resolve_inheritance
+
+      diagram = ::Xumlidot::Diagram.new(constants, options)
+      diagram.draw
+    end
+
+    private
+
+    attr_accessor :directories, :options
+  end
+end