railroady 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d565533ee7d711876ffa48fa7fb5eb5d97f3fb28
-  data.tar.gz: a1414c8accaa8c52e40b85aaaf115ee12899104b
+SHA256:
+  metadata.gz: e60172ea20b64daead4e5a040e50c92e411a0ea0824d4bb6836978d16ce7cf82
+  data.tar.gz: d1fb29719573215458dfb3cacf01d0d96a5b98a479accd0688ddd4cab231f5ca
 SHA512:
-  metadata.gz: 47b51fc682b68870f96deace84cfb46a3e3cd4c206fd6cdb26067d50073dc8fb99e02391af130e3593905ff586bbddd695dc2e66d17ac43defe4b9927fbf1519
-  data.tar.gz: f8addb9684490a38fa1378f576c5853ac393982e91e5a73348aecffa1bd30cfc8956c4848f1f24687465ce73106e663d73374acaaede6c247d6611dafbf2e813
+  metadata.gz: 458f52b7f8f07b1abae06ee141a4a098f67e8882b1087383d4cfee6d642d2f766cb2937037ee39e87a1c68aadce9321c9c208470423fa8982d17b8bbd0a15f48
+  data.tar.gz: 9d8e33334f7727d5f7049446416328f91f2221d3d8ee261300e44c7507174b4610bab7c447d3511c773bc962dcc73661711493a069a2132bbbd67e06783417f0

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
- - 2.4.1
+ - 3.0.2

data/AUTHORS.rdoc

@@ -16,6 +16,6 @@ http://railroady.prestonlee.com
 * Tim Harvey
 * Atli Christiansen
 * John Bintz (http://www.coswellproductions.com/)
-
+* Stefan Wrobel
 
 And of course, many thanks to the many patch submitters and testers that make this possible!

data/Gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,26 +1,28 @@
 PATH
   remote: .
   specs:
-    railroady (1.5.3)
+    railroady (1.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.1)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.0.5)
-    i18n (0.8.4)
-    minitest (5.10.2)
-    rake (12.0.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.9)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    rake (13.0.6)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   activesupport
@@ -30,4 +32,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.15.1
+   2.2.22

data/bin/railroady

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # RailRoady - RoR diagrams generator
 # http://github.com/preston/railroady
@@ -25,7 +26,8 @@ APP_HUMAN_NAME = 'RailRoady'
 APP_VERSION    = RailRoady::VERSION
 COPYRIGHT      = 'Copyright (C) 2007-2008 Javier Smaldone, 2009 Peter Hoeg, 2010-2015 Preston Lee'
 
-options = OptionsStruct.new(app_name: APP_NAME, app_human_name: APP_HUMAN_NAME, app_version: APP_VERSION, copyright: COPYRIGHT)
+options = OptionsStruct.new(app_name: APP_NAME, app_human_name: APP_HUMAN_NAME, app_version: APP_VERSION,
+                            copyright: COPYRIGHT)
 
 options.parse ARGV
 
@@ -44,7 +46,7 @@ when 'controllers'
 when 'aasm'
   diagram = AasmDiagram.new(options)
 else
-  STDERR.print "#{APP_HUMAN_NAME} v#{APP_VERSION}\n" \
+  $stderr.print "#{APP_HUMAN_NAME} v#{APP_VERSION}\n" \
     "Error: You must supply a command\n" \
     "  (try #{APP_NAME} -h)\n\n"
   exit 1

data/lib/railroady.rb

@@ -1,5 +1,13 @@
-%w(version options_struct models_diagram controllers_diagram aasm_diagram).each { |f| require "railroady/#{f}" }
+# frozen_string_literal: true
 
+require 'railroady/version'
+require 'railroady/options_struct'
+require 'railroady/models_diagram'
+require 'railroady/controllers_diagram'
+require 'railroady/aasm_diagram'
+
+# This is the RailRoady module
+# TODO: documentation
 module RailRoady
   require 'railroady/railtie' if defined?(Rails)
 end

data/lib/railroady/aasm_diagram.rb

@@ -1,10 +1,4 @@
-# RailRoady - RoR diagrams generator
-# http://railroad.rubyforge.org
-#
-# Copyright 2007-2008 - Javier Smaldone (http://www.smaldone.com.ar)
-# See COPYING for more details
-
-# AASM code provided by Ana Nelson (http://ananelson.com/)
+# frozen_string_literal: true
 
 require 'railroady/app_diagram'
 
@@ -20,18 +14,17 @@ class AasmDiagram < AppDiagram
 
   # Process model files
   def generate
-    STDERR.print "Generating AASM diagram\n" if @options.verbose
+    $stderr.print "Generating AASM diagram\n" if @options.verbose
     get_files.each do |f|
       process_class extract_class_name(f).constantize
     end
   end
 
   def get_files(prefix = '')
-    files = !@options.specify.empty? ? Dir.glob(@options.specify) : Dir.glob(prefix + 'app/models/**/*.rb')
+    files = !@options.specify.empty? ? Dir.glob(@options.specify) : Dir.glob("#{prefix}app/models/**/*.rb")
     files += Dir.glob('vendor/plugins/**/app/models/*.rb') if @options.plugins_models
-    files -= Dir.glob(prefix + 'app/models/concerns/**/*.rb') unless @options.include_concerns
-    files -= Dir.glob(@options.exclude)
-    files
+    files - Dir.glob("#{prefix}app/models/concerns/**/*.rb") unless @options.include_concerns
+    Dir.glob(@options.exclude)
   end
 
   private
@@ -45,49 +38,25 @@ class AasmDiagram < AppDiagram
     enable_stdout
     print_error 'model classes'
     raise
-  end  # load_classes
+  end
 
   # Process a model class
   def process_class(current_class)
-    STDERR.print "\tProcessing #{current_class}\n" if @options.verbose
+    $stderr.print "\tProcessing #{current_class}\n" if @options.verbose
 
-    # Only interested in acts_as_state_machine models.
-    process_acts_as_state_machine_class(current_class)  if current_class.respond_to?(:states)
+    # Only interested in aasm models.
     process_aasm_class(current_class)  if current_class.respond_to?(:aasm_states) || current_class.respond_to?(:aasm)
-  end # process_class
-
-  def process_acts_as_state_machine_class(current_class)
-    node_attribs = []
-    node_type = 'aasm'
-
-    STDERR.print "\t\tprocessing as acts_as_state_machine\n" if @options.verbose
-    current_class.aasm.states.each do |state_name|
-      node_shape = (current_class.aasm.initial_state == state_name) ? ', peripheries = 2' : ''
-      node_attribs << "#{current_class.name.downcase}_#{state_name} [label=#{state_name} #{node_shape}];"
-    end
-    @graph.add_node [node_type, current_class.name, node_attribs]
-
-    current_class.aasm.events.each do |event|
-      event_name = event.name
-      event.transitions.each do |transition|
-        @graph.add_edge [
-          'event',
-          current_class.name.downcase + '_' + transition.from.to_s,
-          current_class.name.downcase + '_' + transition.to.to_s,
-          event_name.to_s
-        ]
-      end
-    end
   end
 
   def process_aasm_class(current_class)
     node_attribs = []
     node_type = 'aasm'
+    diagram_friendly_class_name = current_class.name.downcase.gsub(/[^a-z0-9\-_]+/i, '_')
 
-    STDERR.print "\t\tprocessing as aasm\n" if @options.verbose
+    $stderr.print "\t\tprocessing as aasm\n" if @options.verbose
     current_class.aasm.states.each do |state|
-      node_shape = (current_class.aasm.initial_state == state.name) ? ', peripheries = 2' : ''
-      node_attribs << "#{current_class.name.downcase}_#{state.name} [label=#{state.name} #{node_shape}];"
+      node_shape = current_class.aasm.initial_state == state.name ? ', peripheries = 2' : ''
+      node_attribs << "#{diagram_friendly_class_name}_#{state.name} [label=#{state.name} #{node_shape}];"
     end
     @graph.add_node [node_type, current_class.name, node_attribs]
 
@@ -95,11 +64,11 @@ class AasmDiagram < AppDiagram
       event.transitions.each do |transition|
         @graph.add_edge [
           'event',
-          current_class.name.downcase + '_' + transition.from.to_s,
-          current_class.name.downcase + '_' + transition.to.to_s,
+          "#{diagram_friendly_class_name}_#{transition.from}",
+          "#{diagram_friendly_class_name}_#{transition.to}",
           event.name.to_s
         ]
       end
     end
   end
-end # class AasmDiagram
+end

data/lib/railroady/app_diagram.rb

@@ -1,9 +1,3 @@
-# RailRoady - RoR diagrams generator
-# http://railroad.rubyforge.org
-#
-# Copyright 2007-2008 - Javier Smaldone (http://www.smaldone.com.ar)
-# See COPYING for more details
-
 require 'railroady/diagram_graph'
 
 # Root class for RailRoady diagrams
@@ -18,25 +12,25 @@ class AppDiagram
   # Print diagram
   def print
     if @options.output
-      old_stdout = STDOUT.dup
+      old_stdout = $stdout.dup
       begin
-        STDOUT.reopen(@options.output)
+        $stdout.reopen(@options.output)
       rescue
-        STDERR.print "Error: Cannot write diagram to #{@options.output}\n\n"
+        $stderr.print "Error: Cannot write diagram to #{@options.output}\n\n"
         exit 2
       end
     end
 
     if @options.xmi
-      STDERR.print "Generating XMI diagram\n" if @options.verbose
-      STDOUT.print @graph.to_xmi
+      $stderr.print "Generating XMI diagram\n" if @options.verbose
+      $stdout.print @graph.to_xmi
     else
-      STDERR.print "Generating DOT graph\n" if @options.verbose
-      STDOUT.print @graph.to_dot
+      $stderr.print "Generating DOT graph\n" if @options.verbose
+      $stdout.print @graph.to_dot
     end
 
-    STDOUT.reopen(old_stdout) if @options.output
-  end # print
+    $stdout.reopen(old_stdout) if @options.output
+  end
 
   def process
     load_environment
@@ -61,7 +55,7 @@ class AppDiagram
 
   # Load Rails application's environment
   def load_environment
-    STDERR.print "Loading application environment\n" if @options.verbose
+    $stderr.print "Loading application environment\n" if @options.verbose
     begin
       disable_stdout
       l = File.join(Dir.pwd.to_s, @options.config_file)
@@ -72,24 +66,24 @@ class AppDiagram
       print_error 'application environment'
       raise
     end
-    STDERR.print "Loading application classes as we go\n" if @options.verbose
+    $stderr.print "Loading application classes as we go\n" if @options.verbose
   end
 
   # Prevents Rails application from writing to STDOUT
   def disable_stdout
-    @old_stdout = STDOUT.dup
+    @old_stdout = $stdout.dup
     # via  Tomas Matousek, http://www.ruby-forum.com/topic/205887
-    STDOUT.reopen(::RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ ? 'NUL' : '/dev/null')
+    $stdout.reopen(::RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ ? 'NUL' : '/dev/null')
   end
 
   # Restore STDOUT
   def enable_stdout
-    STDOUT.reopen(@old_stdout)
+    $stdout.reopen(@old_stdout)
   end
 
   # Print error when loading Rails application
   def print_error(type)
-    STDERR.print "Error loading #{type}.\n  (Are you running " \
+    $stderr.print "Error loading #{type}.\n  (Are you running " \
                  "#{@options.app_name} on the application's root directory?)\n\n"
   end
 
@@ -100,4 +94,4 @@ class AppDiagram
     # File.basename(filename).chomp(".rb").camelize
     filename.split('/')[2..-1].collect(&:camelize).join('::').chomp('.rb')
   end
-end # class AppDiagram
+end

data/lib/railroady/controllers_diagram.rb

@@ -1,9 +1,3 @@
-# RailRoady - RoR diagrams generator
-# http://railroad.rubyforge.org
-#
-# Copyright 2007-2008 - Javier Smaldone (http://www.smaldone.com.ar)
-# See COPYING for more details
-
 require 'railroady/app_diagram'
 
 # RailRoady controllers diagram
@@ -20,7 +14,7 @@ class ControllersDiagram < AppDiagram
 
   # Process controller files
   def generate
-    STDERR.print "Generating controllers diagram\n" if @options.verbose
+    $stderr.print "Generating controllers diagram\n" if @options.verbose
     files = get_files
     # only add APP_CONTROLLER if it isn't already included from the glob above
     files << APP_CONTROLLER unless files.include? APP_CONTROLLER
@@ -31,10 +25,10 @@ class ControllersDiagram < AppDiagram
       begin
         process_class class_name.constantize
       rescue Exception
-        STDERR.print "Warning: exception #{$ERROR_INFO} raised while trying to load controller class #{f}"
+        $stderr.print "Warning: exception #{$ERROR_INFO} raised while trying to load controller class #{f}"
       end
     end
-  end # generate
+  end
 
   def get_files(prefix = '')
     files = !@options.specify.empty? ? Dir.glob(@options.specify) : Dir.glob(prefix << 'app/controllers/**/*_controller.rb')
@@ -48,7 +42,7 @@ class ControllersDiagram < AppDiagram
   end
 
   def extract_class_name(filename)
-    filename.match(/.*\/controllers\/(.*).rb$/)[1].camelize
+    filename.match(%r{.*/controllers/(.*).rb$})[1].camelize
   end
 
   private
@@ -64,11 +58,11 @@ class ControllersDiagram < AppDiagram
     enable_stdout
     print_error 'controller classes'
     raise
-  end # load_classes
+  end
 
   # Proccess a controller class
   def process_class(current_class)
-    STDERR.print "\tProcessing #{current_class}\n" if @options.verbose
+    $stderr.print "\tProcessing #{current_class}\n" if @options.verbose
 
     if @options.brief
       @graph.add_node ['controller-brief', current_class.name]
@@ -77,15 +71,21 @@ class ControllersDiagram < AppDiagram
       node_attribs = { public: [],
                        protected: [],
                        private: [] }
-      current_class.public_instance_methods(false).sort.each do |m|
-        node_attribs[:public] << m
-      end unless @options.hide_public
-      current_class.protected_instance_methods(false).sort.each do |m|
-        node_attribs[:protected] << m
-      end unless @options.hide_protected
-      current_class.private_instance_methods(false).sort.each do |m|
-        node_attribs[:private] << m
-      end unless @options.hide_private
+      unless @options.hide_public
+        current_class.public_instance_methods(false).sort.each do |m|
+          node_attribs[:public] << m
+        end
+      end
+      unless @options.hide_protected
+        current_class.protected_instance_methods(false).sort.each do |m|
+          node_attribs[:protected] << m
+        end
+      end
+      unless @options.hide_private
+        current_class.private_instance_methods(false).sort.each do |m|
+          node_attribs[:private] << m
+        end
+      end
       @graph.add_node ['controller', current_class.name, node_attribs]
     elsif @options.modules && current_class.is_a?(Module)
       @graph.add_node ['module', current_class.name]
@@ -95,9 +95,9 @@ class ControllersDiagram < AppDiagram
     if @options.inheritance && (transitive_subclasses_of(ApplicationController).include? current_class)
       @graph.add_edge ['is-a', current_class.superclass.name, current_class.name]
     end
-  end # process_class
+  end
 
   def transitive_subclasses_of(klass)
     klass.subclasses | klass.subclasses.map { |subklass| transitive_subclasses_of(subklass) }.flatten
   end
-end # class ControllersDiagram
+end

data/lib/railroady/diagram_graph.rb

@@ -1,11 +1,8 @@
-# RailRoady - RoR diagrams generator
-# http://railroad.rubyforge.org
-#
-# Copyright 2007-2008 - Javier Smaldone (http://www.smaldone.com.ar)
-# See COPYING for more details
+# frozen_string_literal: true
 
-# RailRoady diagram structure
 class DiagramGraph
+  attr_writer :diagram_type, :show_label, :alphabetize
+
   def initialize
     @diagram_type = ''
     @show_label   = false
@@ -22,12 +19,6 @@ class DiagramGraph
     @edges << edge
   end
 
-  attr_writer :diagram_type
-
-  attr_writer :show_label
-
-  attr_writer :alphabetize
-
   # Generate DOT graph
   def to_dot
     dot_header +
@@ -38,7 +29,7 @@ class DiagramGraph
 
   # Generate XMI diagram (not yet implemented)
   def to_xmi
-    STDERR.print "Sorry. XMI output not yet implemented.\n\n"
+    $stderr.print "Sorry. XMI output not yet implemented.\n\n"
     ''
   end
 
@@ -62,8 +53,12 @@ class DiagramGraph
     "\t_diagram_info [shape=\"plaintext\", " \
            "label=\"#{@diagram_type} diagram\\l" \
            "Date: #{Time.now.strftime '%b %d %Y - %H:%M'}\\l" +
-      (defined?(ActiveRecord::Migrator) ? 'Migration version: ' \
-       "#{Rails.logger.silence { ActiveRecord::Migrator.current_version } }\\l" : '') +
+      (if defined?(ActiveRecord::Migrator)
+         'Migration version: ' \
+              "#{Rails.logger.silence { ActiveRecord::Migrator.current_version }}\\l"
+       else
+         ''
+       end) +
       "Generated by #{APP_HUMAN_NAME} #{APP_VERSION}\\l" + 'http://railroady.prestonlee.com' \
            "\\l\", fontsize=13]\n"
   end
@@ -71,35 +66,34 @@ class DiagramGraph
   # Build a DOT graph node
   def dot_node(type, name, attributes = nil, custom_options = '')
     case type
-      when 'model'
-        options = 'shape=Mrecord, label="{' + name + '|'
-        options += attributes.sort_by { |s| @alphabetize ? s : nil }.join('\l')
-        options += '\l}"'
-      when 'model-brief'
-        options = ''
-      when 'class'
-        options = 'shape=record, label="{' + name + '|}"'
-      when 'class-brief'
-        options = 'shape=box'
-      when 'controller'
-        options = 'shape=Mrecord, label="{' + name + '|'
-        public_methods    = attributes[:public].sort_by    { |s| @alphabetize ? s : nil }.join('\l')
-        protected_methods = attributes[:protected].sort_by { |s| @alphabetize ? s : nil }.join('\l')
-        private_methods   = attributes[:private].sort_by   { |s| @alphabetize ? s : nil }.join('\l')
-        options += public_methods + '\l|' + protected_methods + '\l|' +
-                   private_methods + '\l'
-        options += '}"'
-      when 'controller-brief'
-        options = ''
-      when 'module'
-        options = 'shape=box, style=dotted, label="' + name + '"'
-      when 'aasm'
-        # Return subgraph format
-        return "subgraph cluster_#{name.downcase} {\n\tlabel = #{quote(name)}\n\t#{attributes.join("\n  ")}}"
-    end # case
-    options = [options, custom_options].compact.reject{|o| o.empty?}.join(', ')
-    return "\t#{quote(name)} [#{options}]\n"
-  end # dot_node
+    when 'model'
+      options = "shape=Mrecord, label=\"{#{name}|"
+      options += attributes.sort_by { |s| @alphabetize ? s : nil }.join('\l')
+      options += '\l}"'
+    when 'model-brief'
+      options = ''
+    when 'class'
+      options = "shape=record, label=\"{#{name}|}\""
+    when 'class-brief'
+      options = 'shape=box'
+    when 'controller'
+      options = "shape=Mrecord, label=\"{#{name}|"
+      public_methods    = attributes[:public].sort_by    { |s| @alphabetize ? s : nil }.join('\l')
+      protected_methods = attributes[:protected].sort_by { |s| @alphabetize ? s : nil }.join('\l')
+      private_methods   = attributes[:private].sort_by   { |s| @alphabetize ? s : nil }.join('\l')
+      options += "#{public_methods}\\l|#{protected_methods}\\l|#{private_methods}\\l"
+      options += '}"'
+    when 'controller-brief'
+      options = ''
+    when 'module'
+      options = "shape=box, style=dotted, label=\"#{name}\""
+    when 'aasm'
+      # Return subgraph format
+      return "subgraph cluster_#{name.downcase.gsub(/[^a-z0-9\-_]+/i, '_')} {\n\tlabel = #{quote(name)}\n\t#{attributes.join("\n  ")}}"
+    end
+    options = [options, custom_options].compact.reject(&:empty?).join(', ')
+    "\t#{quote(name)} [#{options}]\n"
+  end
 
   # Build a DOT graph edge
   def dot_edge(type, from, to, name = '')
@@ -107,25 +101,25 @@ class DiagramGraph
     edge_color = '"#%02X%02X%02X"' % [rand(255), rand(255), rand(255)]
     suffix = ", dir=both color=#{edge_color}"
     case type
-      when 'one-one'
-        options += 'arrowtail=odot, arrowhead=dot' + suffix
-      when 'one-many'
-        options += 'arrowtail=odot, arrowhead=crow' + suffix
-      when 'many-many'
-        options += "arrowtail=crow, arrowhead=crow" + suffix
-      when 'belongs-to'
-           # following http://guides.rubyonrails.org/association_basics.html#the-belongs-to-association
-           options += "arrowtail=none, arrowhead=normal" + suffix
-      when 'is-a'
-        options += 'arrowhead="none", arrowtail="onormal"'
-      when 'event'
-        options += 'fontsize=10'
+    when 'one-one'
+      options += "arrowtail=odot, arrowhead=dot#{suffix}"
+    when 'one-many'
+      options += "arrowtail=odot, arrowhead=crow#{suffix}"
+    when 'many-many'
+      options += "arrowtail=crow, arrowhead=crow#{suffix}"
+    when 'belongs-to'
+      # following http://guides.rubyonrails.org/association_basics.html#the-belongs-to-association
+      options += "arrowtail=none, arrowhead=normal#{suffix}"
+    when 'is-a'
+      options += 'arrowhead="none", arrowtail="onormal"'
+    when 'event'
+      options += 'fontsize=10'
     end
     "\t#{quote(from)} -> #{quote(to)} [#{options}]\n"
-  end # dot_edge
+  end
 
   # Quotes a class name
   def quote(name)
-    '"' + name.to_s + '"'
+    "\"#{name}\""
   end
-end # class DiagramGraph
+end

data/lib/railroady/models_diagram.rb

@@ -1,9 +1,3 @@
-# RailRoady - RoR diagrams generator
-# http://railroad.rubyforge.org
-#
-# Copyright 2007-2008 - Javier Smaldone (http://www.smaldone.com.ar)
-# See COPYING for more details
-
 require 'railroady/app_diagram'
 
 # RailRoady models diagram
@@ -17,20 +11,20 @@ class ModelsDiagram < AppDiagram
 
   # Process model files
   def generate
-    STDERR.puts 'Generating models diagram' if @options.verbose
+    warn 'Generating models diagram' if @options.verbose
     get_files.each do |f|
       begin
         process_class extract_class_name(f).constantize
-      rescue Exception
-        STDERR.puts "Warning: exception #{$ERROR_INFO} raised while trying to load model class #{f}"
+      rescue NoMethodError
+        warn "Warning: exception #{$ERROR_INFO} raised while trying to load model class #{f}"
       end
     end
   end
 
   def get_files(prefix = '')
-    files = !@options.specify.empty? ? Dir.glob(@options.specify) : Dir.glob(prefix + 'app/models/**/*.rb')
+    files = !@options.specify.empty? ? Dir.glob(@options.specify) : Dir.glob("#{prefix}app/models/**/*.rb")
     files += Dir.glob('vendor/plugins/**/app/models/*.rb') if @options.plugins_models
-    files -= Dir.glob(prefix + 'app/models/concerns/**/*.rb') unless @options.include_concerns
+    files -= Dir.glob("#{prefix}app/models/concerns/**/*.rb") unless @options.include_concerns
     files += engine_files if @options.engine_models
     files -= Dir.glob(@options.exclude)
     files
@@ -41,17 +35,19 @@ class ModelsDiagram < AppDiagram
   end
 
   def extract_class_name(filename)
-    filename_was, class_name = filename, nil
+    filename_was = filename
+    class_name = nil
 
     filename = "app/models/#{filename.split('app/models')[1]}"
 
     while filename.split('/').length > 2
       begin
-        class_name = filename.match(/.*\/models\/(.*).rb$/)[1].camelize
+        class_name = filename.match(%r{.*/models/(.*).rb$})[1]
+        class_name = class_name.camelize
+        # class_name = class_name.from 2 if class_name.start_with? '::'
         class_name.constantize
-
         break
-      rescue Exception
+      rescue NoMethodError
         class_name = nil
         filename_end = filename.split('/')[2..-1]
         filename_end.shift
@@ -60,15 +56,16 @@ class ModelsDiagram < AppDiagram
     end
 
     if class_name.nil?
-      filename_was.match(/.*\/models\/(.*).rb$/)[1].camelize
+      filename_was.match(%r{.*/models/(.*).rb$})[1].camelize
     else
+      warn class_name
       class_name
     end
   end
 
   # Process a model class
   def process_class(current_class)
-    STDERR.puts "Processing #{current_class}" if @options.verbose
+    warn "Processing #{current_class}" if @options.verbose
 
     generated =
       if defined?(CouchRest::Model::Base) && current_class.new.is_a?(CouchRest::Model::Base)
@@ -85,13 +82,14 @@ class ModelsDiagram < AppDiagram
         process_basic_module(current_class)
       end
 
+    warn generated
     if @options.inheritance && generated && include_inheritance?(current_class)
       @graph.add_edge ['is-a', current_class.superclass.name, current_class.name]
     end
-  end # process_class
+  end
 
   def include_inheritance?(current_class)
-    STDERR.puts current_class.superclass if @options.verbose
+    warn current_class.superclass if @options.verbose
     (defined?(ActiveRecord::Base) ? current_class.superclass != ActiveRecord::Base : true) &&
       (defined?(CouchRest::Model::Base) ? current_class.superclass != CouchRest::Model::Base : true) &&
       (current_class.superclass != Object)
@@ -121,16 +119,16 @@ class ModelsDiagram < AppDiagram
       if @options.hide_magic
         # From patch #13351
         # http://wiki.rubyonrails.org/rails/pages/MagicFieldNames
-        magic_fields = %w(created_at created_on updated_at updated_on lock_version type id position parent_id lft rgt quote template)
-        magic_fields << current_class.table_name + '_count' if current_class.respond_to? 'table_name'
-        content_columns = current_class.content_columns.select { |c| !magic_fields.include? c.name }
+        magic_fields = %w[created_at created_on updated_at updated_on lock_version type id position parent_id lft rgt quote template]
+        magic_fields << "#{current_class.table_name}_count" if current_class.respond_to? 'table_name'
+        content_columns = current_class.content_columns.reject { |c| magic_fields.include? c.name }
       else
         content_columns = current_class.columns
       end
 
       content_columns.each do |a|
         content_column = a.name
-        content_column += ' :' + a.sql_type.to_s unless @options.hide_types
+        content_column += " :#{a.sql_type.to_s}" unless @options.hide_types
         node_attribs << content_column
       end
     end
@@ -141,7 +139,7 @@ class ModelsDiagram < AppDiagram
     if @options.inheritance && ! @options.transitive
       superclass_associations = current_class.superclass.reflect_on_all_associations
 
-      associations = associations.select { |a| !superclass_associations.include? a }
+      associations = associations.reject { |a| superclass_associations.include? a }
       # This doesn't works!
       # associations -= current_class.superclass.reflect_on_all_associations
     end
@@ -167,13 +165,13 @@ class ModelsDiagram < AppDiagram
         # From patch #13351
         # http://wiki.rubyonrails.org/rails/pages/MagicFieldNames
         magic_fields =
-          %w(created_at created_on updated_at updated_on lock_version _type _id position parent_id lft rgt quote template)
-        props = props.select { |c| !magic_fields.include?(c.name.to_s) }
+          %w[created_at created_on updated_at updated_on lock_version _type _id position parent_id lft rgt quote template]
+        props = props.reject { |c| magic_fields.include?(c.name.to_s) }
       end
 
       props.each do |a|
         prop = a.name.to_s
-        prop += ' :' + a.class.name.split('::').last unless @options.hide_types
+        prop += " :#{a.class.name.split('::').last}" unless @options.hide_types
         node_attribs << prop
       end
     end
@@ -205,8 +203,8 @@ class ModelsDiagram < AppDiagram
       if @options.hide_magic
         # From patch #13351
         # http://wiki.rubyonrails.org/rails/pages/MagicFieldNames
-        magic_fields = %w(created_at created_on updated_at updated_on lock_version _type _id position parent_id lft rgt quote template)
-        content_columns = content_columns.select { |c| !magic_fields.include?(c.name) }
+        magic_fields = %w[created_at created_on updated_at updated_on lock_version _type _id position parent_id lft rgt quote template]
+        content_columns = content_columns.reject { |c| magic_fields.include?(c.name) }
       end
 
       content_columns.each do |a|
@@ -251,8 +249,8 @@ class ModelsDiagram < AppDiagram
       content_columns = current_class.properties
 
       if @options.hide_magic
-        magic_fields = %w(created_at updated_at type _id _rev)
-        content_columns = content_columns.select { |c| !magic_fields.include?(c.name) }
+        magic_fields = %w[created_at updated_at type _id _rev]
+        content_columns = content_columns.reject { |c| magic_fields.include?(c.name) }
       end
 
       content_columns.each do |a|
@@ -269,11 +267,10 @@ class ModelsDiagram < AppDiagram
 
   # Process a model association
   def process_association(class_name, assoc)
-    STDERR.puts "- Processing model association #{assoc.name}" if @options.verbose
-
+    warn "- Processing model association #{assoc.name}" if @options.verbose
     # Skip "belongs_to" associations
-    macro = assoc.macro.to_s
-    return if %w(belongs_to referenced_in).include?(macro) && !@options.show_belongs_to
+    macro = assoc.methods.to_s
+    return if %w[belongs_to referenced_in].include?(macro) && !@options.show_belongs_to
 
     # Skip "through" associations
     through = assoc.options.include?(:through)
@@ -299,29 +296,30 @@ class ModelsDiagram < AppDiagram
     if class_name.include?('::') && !assoc_class_name.include?('::')
       assoc_class_name = class_name.split('::')[0..-2].push(assoc_class_name).join('::')
     end
-    assoc_class_name.gsub!(/^::/, '')
+    assoc_class_name = assoc_class_name.gsub(/^::/, '')
 
-    if %w(has_one references_one embeds_one).include?(macro)
+    if %w[has_one references_one embeds_one].include?(macro)
       assoc_type = 'one-one'
     elsif macro == 'has_many' && (!assoc.options[:through]) ||
-          %w(references_many embeds_many).include?(macro)
+          %w[references_many embeds_many].include?(macro)
       assoc_type = 'one-many'
     elsif macro == 'belongs_to'
       assoc_type = 'belongs-to'
     else # habtm or has_many, :through
       # Add FAKE associations too in order to understand mistakes
       return if @habtm.include? [assoc_class_name, class_name, assoc_name]
+
       assoc_type = 'many-many'
       @habtm << [class_name, assoc_class_name, assoc_name]
     end
     # from patch #12384
     # @graph.add_edge [assoc_type, class_name, assoc.class_name, assoc_name]
     @graph.add_edge [assoc_type, class_name, assoc_class_name, assoc_name]
-  end # process_association
+  end
 
   # Process a DataMapper relationship
   def process_datamapper_relationship(class_name, relation)
-    STDERR.puts "- Processing DataMapper model relationship #{relation.name}" if @options.verbose
+    warn "- Processing DataMapper model relationship #{relation.name}" if @options.verbose
 
     # Skip "belongs_to" relationships
     dm_type = relation.class.to_s.split('::')[-2]
@@ -354,4 +352,4 @@ class ModelsDiagram < AppDiagram
 
     @graph.add_edge [rel_type, class_name, assoc_class_name, assoc_name]
   end
-end # class ModelsDiagram
+end

data/lib/railroady/options_struct.rb

@@ -1,8 +1,4 @@
-# RailRoady - RoR diagrams generator
-# http://railroad.rubyforge.org
-#
-# Copyright 2007-2008 - Javier Smaldone (http://www.smaldone.com.ar)
-# See COPYING for more details
+# frozen_string_literal: true
 
 require 'ostruct'
 
@@ -40,7 +36,7 @@ class OptionsStruct < OpenStruct
                      config_file: 'config/environment',
                      app_name: 'railroady', app_human_name: 'Railroady', app_version: '', copyright: '' }
     super(init_options.merge(args))
-  end # initialize
+  end
 
   def parse(args)
     @opt_parser = OptionParser.new do |opts|
@@ -138,11 +134,11 @@ class OptionsStruct < OpenStruct
       opts.separator ''
       opts.separator 'Other options:'
       opts.on('-h', '--help', 'Show this message') do
-        STDOUT.print "#{opts}\n"
+        $stdout.print "#{opts}\n"
         exit
       end
       opts.on('--version', 'Show version and copyright') do
-        STDOUT.print "#{app_human_name} version #{app_version}\n\n" \
+        $stdout.print "#{app_human_name} version #{app_version}\n\n" \
                      "#{copyright}\nThis is free software; see the source " \
                      "for copying conditions.\n\n"
         exit
@@ -154,7 +150,7 @@ class OptionsStruct < OpenStruct
       opts.separator 'Commands (you must supply one of these):'
       opts.on('-M', '--models', 'Generate models diagram') do |_c|
         if command != ''
-          STDERR.print "Error: Can only generate one diagram type\n\n"
+          $stderr.print "Error: Can only generate one diagram type\n\n"
           exit 1
         else
           self.command = 'models'
@@ -162,16 +158,16 @@ class OptionsStruct < OpenStruct
       end
       opts.on('-C', '--controllers', 'Generate controllers diagram') do |_c|
         if command != ''
-          STDERR.print "Error: Can only generate one diagram type\n\n"
+          $stderr.print "Error: Can only generate one diagram type\n\n"
           exit 1
         else
           self.command = 'controllers'
         end
       end
       # From Ana Nelson's patch
-      opts.on('-A', '--aasm', "Generate \"acts as state machine\" diagram") do |_c|
+      opts.on('-A', '--aasm', 'Generate "acts as state machine" diagram') do |_c|
         if command == 'controllers'
-          STDERR.print "Error: Can only generate one diagram type\n\n"
+          $stderr.print "Error: Can only generate one diagram type\n\n"
           exit 1
         else
           self.command = 'aasm'
@@ -180,7 +176,7 @@ class OptionsStruct < OpenStruct
       opts.separator ''
       opts.separator 'For bug reporting and additional information, please see:'
       opts.separator 'http://railroad.rubyforge.org/'
-    end # do
+    end
 
     begin
       @opt_parser.parse!(args)
@@ -193,12 +189,12 @@ class OptionsStruct < OpenStruct
     rescue OptionParser::MissingArgument
       option_error 'Missing argument'
     end
-  end  # parse
+  end
 
   private
 
   def option_error(msg)
-    STDERR.print "Error: #{msg}\n\n #{@opt_parser}\n"
+    $stderr.print "Error: #{msg}\n\n #{@opt_parser}\n"
     exit 1
   end
-end  # class OptionsStruct
+end

data/lib/railroady/railtie.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'railroady'
 require 'rails'
+
 module RailRoady
   class Railtie < Rails::Railtie
     rake_tasks do

data/lib/railroady/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailRoady
-  VERSION = '1.5.3'
+  VERSION = '1.6.0'
 end

data/railroady.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'railroady/version'
 
@@ -7,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.name          = 'railroady'
   spec.version       = RailRoady::VERSION
   spec.authors       = ['Preston Lee', 'Tobias Crawley', 'Peter Hoeg', 'Javier Smaldone']
-  spec.description  = "Ruby on Rails 3/4/5 model and controller UML class diagram generator. Originally based on the 'railroad' plugin and contributions of many others. (`brew install graphviz` before use!)"
-  spec.email        = ['preston.lee@prestonlee.com', 'tcrawley@gmail.com', 'peter@hoeg.com', 'p.hoeg@northwind.sg', 'javier@smaldone.com.ar']
-  spec.summary      = 'Ruby on Rails 3/4 model and controller UML class diagram generator.'
+  spec.description  = "Ruby on Rails model and controller UML class diagram generator. Originally based on the 'railroad' plugin and contributions of many others. (`brew install graphviz` before use!)"
+  spec.email        = %w[preston.lee@prestonlee.com tcrawley@gmail.com peter@hoeg.com p.hoeg@northwind.sg javier@smaldone.com.ar]
+  spec.summary      = 'Ruby on Rails model and controller UML class diagram generator.'
   spec.homepage      = 'http://github.com/preston/railroady'
   spec.license       = 'GPLv2'
 
@@ -18,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'activesupport'
+  spec.add_development_dependency 'rake'
 end

data/tasks/railroady.rake

@@ -54,7 +54,7 @@ namespace :diagram do
   end
 
   namespace :models do
-    desc 'Generated brief and complete class diagrams for all models.'
+    desc 'Generates brief and complete class diagrams for all models.'
     task all: ['diagram:setup:create_new_doc_folder_if_needed', 'diagram:models:complete', 'diagram:models:brief']
 
     desc 'Generates a class diagram for all models.'
@@ -87,7 +87,7 @@ namespace :diagram do
   end
 
   namespace :controllers do
-    desc 'Generated brief and complete class diagrams for all controllers.'
+    desc 'Generates brief and complete class diagrams for all controllers.'
     task all: ['diagram:setup:create_new_doc_folder_if_needed', 'diagram:controllers:complete', 'diagram:controllers:brief']
 
     desc 'Generates a class diagram for all controllers.'

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: railroady
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Preston Lee
 - Tobias Crawley
 - Peter Hoeg
 - Javier Smaldone
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,7 +56,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,9 +69,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Ruby on Rails 3/4/5 model and controller UML class diagram generator.
-  Originally based on the 'railroad' plugin and contributions of many others. (`brew
-  install graphviz` before use!)
+description: Ruby on Rails model and controller UML class diagram generator. Originally
+  based on the 'railroad' plugin and contributions of many others. (`brew install
+  graphviz` before use!)
 email:
 - preston.lee@prestonlee.com
 - tcrawley@gmail.com
@@ -126,7 +126,7 @@ homepage: http://github.com/preston/railroady
 licenses:
 - GPLv2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,11 +141,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.2.25
+signing_key:
 specification_version: 4
-summary: Ruby on Rails 3/4 model and controller UML class diagram generator.
+summary: Ruby on Rails model and controller UML class diagram generator.
 test_files:
 - test/file_fixture/app/controllers/application_controller.rb
 - test/file_fixture/app/controllers/dummy1_controller.rb