railroady 1.3.0 → 1.3.1

data/lib/railroady/railtie.rb

@@ -2,11 +2,10 @@ require 'railroady'
 require 'rails'
 module RailRoady
   class Railtie < Rails::Railtie
-	
     rake_tasks do
-	  f = File.join(File.dirname(__FILE__), '..', '..', 'tasks', 'railroady.rake')
-     load f
-		# load 'tasks/railroady.rake'
+      f = File.join(File.dirname(__FILE__), '..', '..', 'tasks', 'railroady.rake')
+      load f
+      # load 'tasks/railroady.rake'
     end
   end
-end
+end

data/lib/railroady/version.rb

@@ -1,3 +1,3 @@
 module RailRoady
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/railroady.gemspec

@@ -4,23 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'railroady/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "railroady"
+  spec.name          = 'railroady'
   spec.version       = RailRoady::VERSION
-  spec.authors       = ["Preston Lee", "Tobias Crawley", "Peter Hoeg", "Javier Smaldone"]
+  spec.authors       = ['Preston Lee', 'Tobias Crawley', 'Peter Hoeg', 'Javier Smaldone']
   spec.description  = "Ruby on Rails 3/4 model and controller UML class diagram generator. Originally based on the 'railroad' plugin and contributions of many others. (`sudo port 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.homepage      = "http://github.com/preston/railroady"
-  spec.license       = "GPLv2"
+  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.homepage      = 'http://github.com/preston/railroady'
+  spec.license       = 'GPLv2'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "activesupport"
+  spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'activesupport'
 end

data/tasks/railroady.rake

@@ -31,15 +31,13 @@ module RailRoady
       when /mac|darwin|bsd/
         return "sed -E '#{regex}'"
       else
-        raise NotImplementedError
+        fail NotImplementedError
       end
     end
-
   end
 end
 
 namespace :diagram do
-
   @MODELS_ALL         = RailRoady::RakeHelpers.full_path("models_complete.#{RailRoady::RakeHelpers.format}").freeze
   @MODELS_BRIEF       = RailRoady::RakeHelpers.full_path("models_brief.#{RailRoady::RakeHelpers.format}").freeze
   @CONTROLLERS_ALL    = RailRoady::RakeHelpers.full_path("controllers_complete.#{RailRoady::RakeHelpers.format}").freeze
@@ -49,14 +47,13 @@ namespace :diagram do
   namespace :setup do
     desc 'Perform any setup needed for the gem'
     task :create_new_doc_folder_if_needed do
-      Dir.mkdir('doc') unless File.exists?('doc')
+      Dir.mkdir('doc') unless File.exist?('doc')
     end
   end
 
   namespace :models do
-
     desc 'Generated brief and complete class diagrams for all models.'
-    task :all => ['diagram:models:complete', 'diagram:models:brief']
+    task all: ['diagram:setup:create_new_doc_folder_if_needed', 'diagram:models:complete', 'diagram:models:brief']
 
     desc 'Generates an class diagram for all models.'
     task :complete do
@@ -78,21 +75,18 @@ namespace :diagram do
       puts "Generating #{f}"
       sh "railroady -ilamzM | #{@SED} | dot -T#{RailRoady::RakeHelpers.format} > #{f}"
     end
-    
+
     desc 'Generates an abbreviated class diagram for all models including those in engines'
     task :brief_with_engines do
       f = @MODELS_BRIEF
       puts "Generating #{f}"
       sh "railroady -bilamzM | #{@SED} | dot -T#{RailRoady::RakeHelpers.format} > #{f}"
     end
-
-
   end
 
   namespace :controllers do
-    
     desc 'Generated brief and complete class diagrams for all controllers.'
-    task :all => ['diagram:controllers:complete', 'diagram:controllers:brief']
+    task all: ['diagram:setup:create_new_doc_folder_if_needed', 'diagram:controllers:complete', 'diagram:controllers:brief']
 
     desc 'Generates an class diagram for all controllers.'
     task :complete do
@@ -107,40 +101,37 @@ namespace :diagram do
       puts "Generating #{f}"
       sh "railroady -blC | #{@SED} | neato -T#{RailRoady::RakeHelpers.format} > #{f}"
     end
-    
+
     desc 'Generates an class diagram for all controllers including those in engines'
-    task :complete_with_engines do 
+    task :complete_with_engines do
       f = @CONTROLLERS_ALL
       puts "Generating #{f}"
       sh "railroady -ilC --engine-controllers | #{@SED} | neato -T#{RailRoady::RakeHelpers.format} > #{f}"
     end
-    
+
     desc 'Generates an abbreviated class diagram for all controllers including those in engines.'
     task :brief_with_engines do
       f = @CONTROLLERS_BRIEF
       puts "Generating #{f}"
       sh "railroady -bilC --engine-controllers | #{@SED} | neato -T#{RailRoady::RakeHelpers.format} > #{f}"
     end
-
-    
   end
 
   desc 'Generates all class diagrams.'
   task all: [
-             'diagram:setup:create_new_doc_folder_if_needed',
-             'diagram:models:complete',
-             'diagram:models:brief',
-             'diagram:controllers:complete',
-             'diagram:controllers:brief'
-            ]
+    'diagram:setup:create_new_doc_folder_if_needed',
+    'diagram:models:complete',
+    'diagram:models:brief',
+    'diagram:controllers:complete',
+    'diagram:controllers:brief'
+  ]
 
   desc 'Generates all class diagrams including those in engines'
   task all_with_engines: [
-             'diagram:setup:create_new_doc_folder_if_needed',
-             'diagram:models:complete_with_engines',
-             'diagram:models:brief_with_engines',
-             'diagram:controllers:complete_with_engines',
-             'diagram:controllers:brief_with_engines'
-            ]
-
+    'diagram:setup:create_new_doc_folder_if_needed',
+    'diagram:models:complete_with_engines',
+    'diagram:models:brief_with_engines',
+    'diagram:controllers:complete_with_engines',
+    'diagram:controllers:brief_with_engines'
+  ]
 end

data/test/file_fixture/app/controllers/application_controller.rb

@@ -1,2 +1,2 @@
 class ApplicationController < ActionController::Base
-end
+end

data/test/lib/railroady/aasm_diagram_spec.rb

@@ -2,55 +2,53 @@ require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
 
 describe AasmDiagram do
   describe 'file processing' do
-
     it 'should select all the files under the models dir' do
       ad = AasmDiagram.new
-      files = ad.get_files("test/file_fixture/")
+      files = ad.get_files('test/file_fixture/')
       files.size.must_equal 3
     end
 
     it 'should include concerns if specified' do
-      options = OptionsStruct.new(:include_concerns => true)
+      options = OptionsStruct.new(include_concerns: true)
       ad = AasmDiagram.new(options)
-      files = ad.get_files("test/file_fixture/")
+      files = ad.get_files('test/file_fixture/')
       files.size.must_equal 4
     end
 
     it 'should exclude a specific file' do
-      options = OptionsStruct.new(:exclude => ['test/file_fixture/app/models/dummy1.rb'])
+      options = OptionsStruct.new(exclude: ['test/file_fixture/app/models/dummy1.rb'])
       ad = AasmDiagram.new(options)
-      files = ad.get_files("test/file_fixture/")
+      files = ad.get_files('test/file_fixture/')
       files.size.must_equal 2
     end
 
     it 'should exclude a glob pattern of files' do
-      options = OptionsStruct.new(:exclude => ['test/file_fixture/app/models/*/*.rb'])
+      options = OptionsStruct.new(exclude: ['test/file_fixture/app/models/*/*.rb'])
       ad = AasmDiagram.new(options)
-      files = ad.get_files("test/file_fixture/")
+      files = ad.get_files('test/file_fixture/')
       files.size.must_equal 2
     end
 
     it 'should include only specific file' do
-      options = OptionsStruct.new(:specify => ['test/file_fixture/app/models/sub-dir/sub_dummy.rb'])
+      options = OptionsStruct.new(specify: ['test/file_fixture/app/models/sub-dir/sub_dummy.rb'])
       ad = AasmDiagram.new(options)
-      files = ad.get_files("test/file_fixture/")
+      files = ad.get_files('test/file_fixture/')
       files.size.must_equal 1
     end
 
     it 'should include only specified files' do
-      options = OptionsStruct.new(:specify => ['test/file_fixture/app/models/{dummy1.rb,sub-dir/sub_dummy.rb}'])
+      options = OptionsStruct.new(specify: ['test/file_fixture/app/models/{dummy1.rb,sub-dir/sub_dummy.rb}'])
       ad = AasmDiagram.new(options)
-      files = ad.get_files("test/file_fixture/")
+      files = ad.get_files('test/file_fixture/')
       files.size.must_equal 2
     end
 
     it 'should include only specified files and exclude specified files' do
-      options = OptionsStruct.new(:specify => ['test/file_fixture/app/models/{dummy1.rb,sub-dir/sub_dummy.rb}'],
-                                  :exclude => ['test/file_fixture/app/models/sub-dir/sub_dummy.rb'])
+      options = OptionsStruct.new(specify: ['test/file_fixture/app/models/{dummy1.rb,sub-dir/sub_dummy.rb}'],
+                                  exclude: ['test/file_fixture/app/models/sub-dir/sub_dummy.rb'])
       ad = AasmDiagram.new(options)
-      files = ad.get_files("test/file_fixture/")
+      files = ad.get_files('test/file_fixture/')
       files.size.must_equal 1
     end
-
   end
 end

data/test/lib/railroady/app_diagram_spec.rb

@@ -4,12 +4,11 @@ describe AppDiagram do
   describe 'file name processing' do
     it 'should extract a simple name' do
       ad = AppDiagram.new
-      name = ad.instance_eval {extract_class_name('app/models/test_this.rb')}
+      name = ad.instance_eval { extract_class_name('app/models/test_this.rb') }
       name.must_equal 'TestThis'
     end
     it 'should constantize a name' do
       'String'.constantize.must_equal String
     end
-      
   end
 end

data/test/lib/railroady/controllers_diagram_spec.rb

@@ -2,58 +2,55 @@ require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
 
 describe ControllersDiagram do
   describe 'file processing' do
-
     it 'should select all the files under the controllers dir' do
       cd = ControllersDiagram.new
-      files = cd.get_files("test/file_fixture/")
+      files = cd.get_files('test/file_fixture/')
       files.size.must_equal 4
     end
 
     it 'should exclude a specific file' do
-      options = OptionsStruct.new(:exclude => ['test/file_fixture/app/controllers/dummy1_controller.rb'])
+      options = OptionsStruct.new(exclude: ['test/file_fixture/app/controllers/dummy1_controller.rb'])
       cd = ControllersDiagram.new(options)
-      files = cd.get_files("test/file_fixture/")
+      files = cd.get_files('test/file_fixture/')
       files.size.must_equal 3
     end
 
     it 'should exclude a glob pattern of files' do
-      options = OptionsStruct.new(:exclude => ['test/file_fixture/app/controllers/sub-dir/*.rb'])
+      options = OptionsStruct.new(exclude: ['test/file_fixture/app/controllers/sub-dir/*.rb'])
       cd = ControllersDiagram.new(options)
-      files = cd.get_files("test/file_fixture/")
+      files = cd.get_files('test/file_fixture/')
       files.size.must_equal 3
     end
 
     it 'should include only specific file' do
-      options = OptionsStruct.new(:specify => ['test/file_fixture/app/controllers/sub-dir/sub_dummy_controller.rb'])
+      options = OptionsStruct.new(specify: ['test/file_fixture/app/controllers/sub-dir/sub_dummy_controller.rb'])
       cd = ControllersDiagram.new(options)
-      files = cd.get_files("test/file_fixture/")
+      files = cd.get_files('test/file_fixture/')
       files.size.must_equal 1
     end
 
     it 'should include only specified files' do
-      options = OptionsStruct.new(:specify => ['test/file_fixture/app/controllers/{dummy1_*.rb,sub-dir/sub_dummy_controller.rb}'])
+      options = OptionsStruct.new(specify: ['test/file_fixture/app/controllers/{dummy1_*.rb,sub-dir/sub_dummy_controller.rb}'])
       cd = ControllersDiagram.new(options)
-      files = cd.get_files("test/file_fixture/")
+      files = cd.get_files('test/file_fixture/')
       files.size.must_equal 2
     end
 
     it 'should include only specified files and exclude specified files' do
-      options = OptionsStruct.new(:specify => ['test/file_fixture/app/controllers/{dummy1_*.rb,sub-dir/sub_dummy_controller.rb}'],
-                                  :exclude => ['test/file_fixture/app/controllers/sub-dir/sub_dummy_controller.rb'])
+      options = OptionsStruct.new(specify: ['test/file_fixture/app/controllers/{dummy1_*.rb,sub-dir/sub_dummy_controller.rb}'],
+                                  exclude: ['test/file_fixture/app/controllers/sub-dir/sub_dummy_controller.rb'])
       cd = ControllersDiagram.new(options)
-      files = cd.get_files("test/file_fixture/")
+      files = cd.get_files('test/file_fixture/')
       files.size.must_equal 1
     end
 
-    it "should include engine files" do
-      options = OptionsStruct.new(:engine_controllers => true)
+    it 'should include engine files' do
+      options = OptionsStruct.new(engine_controllers: true)
       md = ControllersDiagram.new(options)
-      engines = [OpenStruct.new(:root => "test/file_fixture/lib")]
+      engines = [OpenStruct.new(root: 'test/file_fixture/lib')]
       md.stub(:engines, engines) do
-        md.get_files.must_include("test/file_fixture/lib/app/controllers/dummy/dummy_controller.rb")
+        md.get_files.must_include('test/file_fixture/lib/app/controllers/dummy/dummy_controller.rb')
       end
     end
-    
-
   end
 end

data/test/lib/railroady/core_ext_spec.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
 
 describe String do
   describe '#camelize' do
-    it "should upper-camelcase a lower case and underscored word" do
+    it 'should upper-camelcase a lower case and underscored word' do
       'lower_case_and_underscored_word'.camelize.must_equal 'LowerCaseAndUnderscoredWord'
     end
 
-    it "should lower-camelcase a lower case and underscored word when the :lower parameter is passed" do
+    it 'should lower-camelcase a lower case and underscored word when the :lower parameter is passed' do
       'lower_case_and_underscored_word'.camelize(:lower).must_equal 'lowerCaseAndUnderscoredWord'
     end
   end

data/test/lib/railroady/diagram_graph_spec.rb

@@ -5,20 +5,24 @@ module CustomDotMatchers
     def initialize(expected)
       @expected = expected
     end
+
     def matches?(target)
       @target = target
       return false unless @target =~ /\[(.*)\]/
-      @options = $1
+      @options = Regexp.last_match(1)
       @options == @expected
     end
+
     def failure_message
       "expected '#{@target.strip}' to have options '[#{@expected}]'"
     end
+
     def negative_failure_message
       "expected '#{@target.strip}' to not have options '[#{@expected}]'"
     end
+
     def description
-      "have dot options"
+      'have dot options'
     end
   end
   def have_dot_options(expected)

data/test/lib/railroady/models_diagram_spec.rb

@@ -2,64 +2,62 @@ require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
 
 describe ModelsDiagram do
   describe 'file  processing' do
-
     it 'should select all the files under the models dir' do
       md = ModelsDiagram.new
-      files = md.get_files("test/file_fixture/")
+      files = md.get_files('test/file_fixture/')
       files.size.must_equal 3
     end
 
     it 'should include concerns if specified' do
-      options = OptionsStruct.new(:include_concerns => true)
+      options = OptionsStruct.new(include_concerns: true)
       ad = ModelsDiagram.new(options)
-      files = ad.get_files("test/file_fixture/")
+      files = ad.get_files('test/file_fixture/')
       files.size.must_equal 4
     end
 
     it 'should exclude a specific file' do
-      options = OptionsStruct.new(:exclude => ['test/file_fixture/app/models/dummy1.rb'])
+      options = OptionsStruct.new(exclude: ['test/file_fixture/app/models/dummy1.rb'])
       md = ModelsDiagram.new(options)
-      files = md.get_files("test/file_fixture/")
+      files = md.get_files('test/file_fixture/')
       files.size.must_equal 2
     end
 
     it 'should exclude a glob pattern of files' do
-      options = OptionsStruct.new(:exclude => ['test/file_fixture/app/models/*/*.rb'])
+      options = OptionsStruct.new(exclude: ['test/file_fixture/app/models/*/*.rb'])
       md = ModelsDiagram.new(options)
-      files = md.get_files("test/file_fixture/")
+      files = md.get_files('test/file_fixture/')
       files.size.must_equal 2
     end
 
     it 'should include only specific file' do
-      options = OptionsStruct.new(:specify => ['test/file_fixture/app/models/sub-dir/sub_dummy.rb'])
+      options = OptionsStruct.new(specify: ['test/file_fixture/app/models/sub-dir/sub_dummy.rb'])
       md = ModelsDiagram.new(options)
-      files = md.get_files("test/file_fixture/")
+      files = md.get_files('test/file_fixture/')
       files.size.must_equal 1
     end
 
     it 'should include only specified files' do
-      options = OptionsStruct.new(:specify => ['test/file_fixture/app/models/{dummy1.rb,sub-dir/sub_dummy.rb}'])
+      options = OptionsStruct.new(specify: ['test/file_fixture/app/models/{dummy1.rb,sub-dir/sub_dummy.rb}'])
       md = ModelsDiagram.new(options)
-      files = md.get_files("test/file_fixture/")
+      files = md.get_files('test/file_fixture/')
       files.size.must_equal 2
     end
 
     it 'should include only specified files and exclude specified files' do
-      options = OptionsStruct.new(:specify => ['test/file_fixture/app/models/{dummy1.rb,sub-dir/sub_dummy.rb}'],
-                                  :exclude => ['test/file_fixture/app/models/sub-dir/sub_dummy.rb'])
+      options = OptionsStruct.new(specify: ['test/file_fixture/app/models/{dummy1.rb,sub-dir/sub_dummy.rb}'],
+                                  exclude: ['test/file_fixture/app/models/sub-dir/sub_dummy.rb'])
       md = ModelsDiagram.new(options)
-      files = md.get_files("test/file_fixture/")
+      files = md.get_files('test/file_fixture/')
       files.size.must_equal 1
     end
 
-    it "should include engine files" do
-      options = OptionsStruct.new(:engine_models => true)
+    it 'should include engine files' do
+      options = OptionsStruct.new(engine_models: true)
       md = ModelsDiagram.new(options)
-      engines = [OpenStruct.new(:root => "test/file_fixture/lib")]
+      engines = [OpenStruct.new(root: 'test/file_fixture/lib')]
       md.stub(:engines, engines) do
-        md.get_files.must_include("test/file_fixture/lib/app/models/dummy1.rb")
+        md.get_files.must_include('test/file_fixture/lib/app/models/dummy1.rb')
       end
     end
-    
   end
 end