railroady 1.1.0 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d861e99e4da72666e52557b3dd4aae91be9c3810
+  data.tar.gz: 877a3dfee6e413da3f9a7b93a9e434847675e97c
+SHA512:
+  metadata.gz: 968bf68e7072cba4ab255c8b2ab1da9f880a077b5269dbc0f65abf8c1a4bf1a224345cfd278f0a51a98061381574038a68d2b1cd8c62437dbffaff8a74642b43
+  data.tar.gz: 78b3e11854e3394ce6db8a9c6554bf807cb356ec68dd6f0075c168b3a4e1682e188f9e25cd1f31a774aba2df1a109881418003c53d6d3ee306febcc6ba406f6d

data/.gitignore

@@ -0,0 +1,10 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+*.gem
+nbproject
+/.gvimrc
+/.vim*
+.rvmrc

data/AUTHORS.rdoc

@@ -12,7 +12,7 @@ http://railroady.prestonlee.com
 * John McCaffrey
 * David Jones
 * Mike Dalessio
-* Preston Lee (http://prestonlee.com)
+* Preston Lee (http://prestonlee.com @prestonism)
 * Tim Harvey
 * Atli Christiansen
 * John Bintz (http://www.coswellproductions.com/)

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 = Changes
 
+== Version 1.1.1
+
+ - Merge in a Sinatra support.
+ - Merge in other pull requests.
+ - Switched from rspec to minitest specs.
+ - Removed jeweler dependency and updated to more recent bundler + gemspec format.
+
 == Version 1.0.2
 
   - Merged in John Bintz's patch to properly strip leading "::" prefixes from class names.

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    railroady (1.1.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.10)
+    i18n (0.6.4)
+    minitest (4.7.5)
+    minitest-spec-context (0.0.3)
+    multi_json (1.7.7)
+    rake (10.1.0)
+    thread_safe (0.1.2)
+      atomic
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  bundler
+  minitest
+  minitest-spec-context
+  railroady!
+  rake

data/README.rdoc

@@ -1,6 +1,6 @@
 = RailRoady 
 
-RailRoady generates Rails 3 model (AcitveRecord, Mongoid, Datamapper) and controller UML diagrams as cross-platform .svg files, as well as in the DOT language.
+RailRoady generates Rails 3/4 model (AcitveRecord, Mongoid, Datamapper) and controller UML diagrams as cross-platform .svg files, as well as in the DOT language.
 
 Code is based on the original "railroad" gem, patched and maintained over the years. Lineage can be traced via GitHub.
 

data/Rakefile

@@ -1,47 +1,12 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "railroady"
-    gem.executables = "railroady"
-    gem.email = ['conmotto@gmail.com', 'tcrawley@gmail.com', 'peter@hoeg.com', 'p.hoeg@northwind.sg', 'javier@smaldone.com.ar']
-    gem.homepage = "http://github.com/preston/railroady"
-    gem.authors = ["Preston Lee", "Tobias Crawley", "Peter Hoeg", "Javier Smaldone"]
-    gem.summary = "Ruby on Rails 3 model and controller UML class diagram generator."
-    gem.description = "Ruby on Rails 3 model and controller UML class diagram generator. Originally based on the 'railroad' plugin and contributions of many others. (`sudo port install graphviz` before use!)"
-    gem.files = FileList["[A-Z]*", "{autotest,bin,lib,spec,tasks}/**/*", ".document"]
-    gem.extra_rdoc_files = FileList["*.rdoc"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'rspec'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-#  spec.libs << 'lib' << 'rspec'
-  spec.pattern = FileList['rspec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-#  spec.libs << 'lib' << 'rspec'
-  spec.pattern = 'rspec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-require 'railroady/version'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "railroady #{RailRoady::VERSION::STRING}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('CHANGELOG*')
-  rdoc.rdoc_files.include('AUTHORS*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+ 
+require 'rake/testtask'
+ 
+Rake::TestTask.new do |t|
+  t.libs << 'lib/railroady'
+  t.test_files = FileList['test/lib/railroady/*_spec.rb']
+  t.verbose = true
+end
+ 
+task :default => :test

data/bin/railroady

@@ -22,7 +22,7 @@ require 'railroady'
 APP_NAME       = "railroady"
 APP_HUMAN_NAME = "RailRoady"
 # APP_VERSION    = [RailRoady::VERSION::MAJOR, RailRoady::VERSION::MINOR, RailRoady::VERSION::PATCH]
-APP_VERSION    = RailRoady::VERSION::STRING
+APP_VERSION    = RailRoady::VERSION
 COPYRIGHT      = "Copyright (C) 2007-2008 Javier Smaldone, 2009 Peter Hoeg, 2010 Preston Lee"
 
 options = OptionsStruct.new({:app_name => APP_NAME, :app_human_name => APP_HUMAN_NAME, :app_version =>APP_VERSION, :copyright =>COPYRIGHT})
@@ -43,7 +43,7 @@ elsif options.command == 'controllers'
 elsif options.command == 'aasm'
   diagram = AasmDiagram.new(options)
 else
-  STDERR.print "#{APP_HUMAN_NAME} v#{RailRoady::VERSION::STRING}\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/app_diagram.rb

@@ -52,7 +52,7 @@ class AppDiagram
     STDERR.print "Loading application environment\n" if @options.verbose
     begin
       disable_stdout
-      l = File.join(Dir.pwd.to_s, 'config/environment')
+      l = File.join(Dir.pwd.to_s, @options.config_file)
       require l
       enable_stdout
     rescue LoadError

data/lib/railroady/controllers_diagram.rb

@@ -85,11 +85,14 @@ class ControllersDiagram < AppDiagram
       @graph.add_node ['module', current_class.name]
     end
 
-    # Generate the inheritance edge (only for ApplicationControllers)
-    if @options.inheritance && 
-       (ApplicationController.subclasses.include? current_class)
+    # Generate the inheritance edge (only for transitive subclasses of ApplicationControllers)
+    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
 
+  def transitive_subclasses_of(klass)
+    klass.subclasses | klass.subclasses.map {|subklass| transitive_subclasses_of(subklass)}.flatten
+  end
+
 end # class ControllersDiagram

data/lib/railroady/models_diagram.rb

@@ -40,7 +40,9 @@ class ModelsDiagram < AppDiagram
     STDERR.puts "Processing #{current_class}" if @options.verbose
 
     generated =
-      if defined?(Mongoid::Document) && current_class.new.is_a?(Mongoid::Document)
+      if defined?(CouchRest::Model::Base) && current_class.new.is_a?(CouchRest::Model::Base)
+        process_couchrest_model(current_class)
+      elsif defined?(Mongoid::Document) && current_class.new.is_a?(Mongoid::Document)
         process_mongoid_model(current_class)
       elsif defined?(DataMapper::Resource) && current_class.new.is_a?(DataMapper::Resource)
         process_datamapper_model(current_class)
@@ -59,7 +61,9 @@ class ModelsDiagram < AppDiagram
   end # process_class
 
   def include_inheritance?(current_class)
-    (defined?(ActiveRecord::Base) && current_class.superclass != ActiveRecord::Base) &&
+    STDERR.puts current_class.superclass if @options.verbose
+    (defined?(ActiveRecord::Base) && current_class.superclass != ActiveRecord::Base) ||
+    (defined?(CouchRest::Model::Base) && current_class.superclass != CouchRest::Model::Base) ||
     (current_class.superclass != Object)
   end
 
@@ -82,15 +86,15 @@ class ModelsDiagram < AppDiagram
       node_type = 'model'
 
       # Collect model's content columns
-    	#content_columns = current_class.content_columns
+      #content_columns = current_class.content_columns
 
-    	if @options.hide_magic
+      if @options.hide_magic
         # From patch #13351
         # http://wiki.rubyonrails.org/rails/pages/MagicFieldNames
         magic_fields = [
-        "created_at", "created_on", "updated_at", "updated_on",
-        "lock_version", "type", "id", "position", "parent_id", "lft",
-        "rgt", "quote", "template"
+          "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}
@@ -162,9 +166,6 @@ class ModelsDiagram < AppDiagram
     true
   end
 
-
-
-
   def process_mongoid_model(current_class)
     node_attribs = []
 
@@ -174,15 +175,15 @@ class ModelsDiagram < AppDiagram
       node_type = 'model'
 
       # Collect model's content columns
-    	content_columns = current_class.fields.values.sort_by(&:name)
+      content_columns = current_class.fields.values.sort_by(&:name)
 
-    	if @options.hide_magic
+      if @options.hide_magic
         # From patch #13351
         # http://wiki.rubyonrails.org/rails/pages/MagicFieldNames
         magic_fields = [
-        "created_at", "created_on", "updated_at", "updated_on",
-        "lock_version", "_type", "_id", "position", "parent_id", "lft",
-        "rgt", "quote", "template"
+          "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) }
       end
@@ -200,7 +201,7 @@ class ModelsDiagram < AppDiagram
     associations = current_class.relations.values
 
     if @options.inheritance && !@options.transitive &&
-       current_class.superclass.respond_to?(:relations)
+      current_class.superclass.respond_to?(:relations)
       associations -= current_class.superclass.relations.values
     end
 
@@ -211,6 +212,42 @@ class ModelsDiagram < AppDiagram
     true
   end
 
+  ##
+  # Some very basic CouchRest::Model support
+  #
+  # Field types note: the field's type is rendered only if it's explicitly
+  # specified in a model.
+  #
+  def process_couchrest_model(current_class)
+    node_attribs = []
+
+    if @options.brief
+      node_type = 'model-brief'
+    else
+      node_type = 'model'
+
+      # Collect model's content columns
+      content_columns = current_class.properties
+
+      if @options.hide_magic
+        magic_fields = [
+          "created_at", "updated_at",
+          "type", "_id", "_rev"
+        ]
+        content_columns = content_columns.select {|c| !magic_fields.include?(c.name) }
+      end
+
+      content_columns.each do |a|
+        content_column = a.name
+        content_column += " :#{a.type}" unless @options.hide_types || a.type.nil?
+        node_attribs << content_column
+      end
+    end
+
+    @graph.add_node [node_type, current_class.name, node_attribs]
+
+    true
+  end
 
   # Process a model association
   def process_association(class_name, assoc)
@@ -261,7 +298,6 @@ class ModelsDiagram < AppDiagram
     # @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 # class ModelsDiagram
 
   # Process a DataMapper relationship
   def process_datamapper_relationship(class_name, relation)
@@ -298,3 +334,7 @@ end # class ModelsDiagram
 
     @graph.add_edge [rel_type, class_name, assoc_class_name, assoc_name ]
   end
+
+end # class ModelsDiagram
+
+

data/lib/railroady/options_struct.rb

@@ -34,6 +34,7 @@ class OptionsStruct < OpenStruct
                      :verbose => false,
                      :xmi => false,
                      :command => '',
+                     :config_file => 'config/environment',
                      :app_name => 'railroady', :app_human_name => 'Railroady', :app_version =>'', :copyright =>'' }
     super(init_options.merge(args))
   end # initialize
@@ -132,6 +133,11 @@ class OptionsStruct < OpenStruct
         exit
       end
       opts.separator ""
+      opts.on("-c", "--config FILE", "File to load environment (defaults to config/environment)") do |c|
+        if c && c != ''
+          self.config_file = c
+        end
+      end
       opts.separator "Commands (you must supply one of these):"
       opts.on("-M", "--models", "Generate models diagram") do |c|
         if self.command != ''

data/lib/railroady/version.rb

@@ -1,15 +1,3 @@
-require 'yaml'
 module RailRoady
-  module VERSION #:nodoc:
-    f = File.join(File.dirname(__FILE__), '..', '..', 'VERSION.yml')
-    if File.exist?(f)
-      config = YAML.load(File.read(f))
-      MAJOR = config[:major]
-      MINOR = config[:minor]
-      PATCH = config[:patch]
-    else
-      MAJOR = MINOR = PATCH = 0
-    end
-    STRING = [MAJOR, MINOR, PATCH].join('.')
-  end
+  VERSION = '1.1.1'
 end

data/railroady.gemspec

@@ -0,0 +1,27 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'railroady/version'
+
+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 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        = ["conmotto@gmail.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.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 "minitest-spec-context"
+  spec.add_development_dependency "activesupport"
+
+end

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

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

data/test/lib/railroady/aasm_diagram_spec.rb

@@ -0,0 +1,49 @@
+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.size.must_equal 3
+    end
+
+    it 'should exclude a specific file' do
+      options = OptionsStruct.new(:exclude => ['test/file_fixture/app/models/dummy1.rb'])
+      ad = AasmDiagram.new(options)
+      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'])
+      ad = AasmDiagram.new(options)
+      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'])
+      ad = AasmDiagram.new(options)
+      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}'])
+      ad = AasmDiagram.new(options)
+      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'])
+      ad = AasmDiagram.new(options)
+      files = ad.get_files("test/file_fixture/")
+      files.size.must_equal 1
+    end
+
+  end
+end

data/test/lib/railroady/app_diagram_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
+
+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.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

@@ -0,0 +1,49 @@
+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.size.must_equal 4
+    end
+
+    it 'should exclude a specific file' do
+      options = OptionsStruct.new(:exclude => ['test/file_fixture/app/controllers/dummy1_controller.rb'])
+      cd = ControllersDiagram.new(options)
+      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'])
+      cd = ControllersDiagram.new(options)
+      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'])
+      cd = ControllersDiagram.new(options)
+      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}'])
+      cd = ControllersDiagram.new(options)
+      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'])
+      cd = ControllersDiagram.new(options)
+      files = cd.get_files("test/file_fixture/")
+      files.size.must_equal 1
+    end
+
+  end
+end

data/test/lib/railroady/core_ext_spec.rb

@@ -0,0 +1,13 @@
+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
+      '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
+      'lower_case_and_underscored_word'.camelize(:lower).must_equal 'lowerCaseAndUnderscoredWord'
+    end
+  end
+end

data/test/lib/railroady/diagram_graph_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
+
+module CustomDotMatchers
+  class HaveDotOptions
+    def initialize(expected)
+      @expected = expected
+    end
+    def matches?(target)
+      @target = target
+      return false unless @target =~ /\[(.*)\]/
+      @options = $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"
+    end
+  end
+  def have_dot_options(expected)
+    HaveDotOptions.new expected
+  end
+end
+
+describe DiagramGraph do
+  include CustomDotMatchers
+
+  before do
+    @diagram_graph = DiagramGraph.new
+  end
+
+  describe ".dot_edge" do
+    context "has_a/belongs_to" do
+      it { @diagram_graph.send(:dot_edge, "one-one", "source", "target").must_include "arrowtail=odot, arrowhead=dot, dir=both" }
+    end
+
+    context "has_many/belongs_to" do
+      it { @diagram_graph.send(:dot_edge, "one-many", "source", "target").must_include "arrowtail=odot, arrowhead=crow, dir=both" }
+    end
+
+    context "habtm" do
+      it { @diagram_graph.send(:dot_edge, "many-many", "source", "target").must_include "arrowtail=crow, arrowhead=crow, dir=both" }
+    end
+  end
+end

data/test/lib/railroady/models_diagram_spec.rb

@@ -0,0 +1,49 @@
+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.size.must_equal 3
+    end
+
+    it 'should exclude a specific file' do
+      options = OptionsStruct.new(:exclude => ['test/file_fixture/app/models/dummy1.rb'])
+      md = ModelsDiagram.new(options)
+      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'])
+      md = ModelsDiagram.new(options)
+      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'])
+      md = ModelsDiagram.new(options)
+      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}'])
+      md = ModelsDiagram.new(options)
+      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'])
+      md = ModelsDiagram.new(options)
+      files = md.get_files("test/file_fixture/")
+      files.size.must_equal 1
+    end
+
+  end
+end

data/test/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'minitest-spec-context'
+require 'active_support/core_ext/string'
+require File.expand_path('../../lib/railroady.rb', __FILE__)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railroady
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors:
 - Preston Lee
@@ -12,9 +11,79 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
-dependencies: []
-description: Ruby on Rails 3 model and controller UML class diagram generator. Originally
+date: 2013-07-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-spec-context
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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!)
 email:
@@ -26,19 +95,16 @@ email:
 executables:
 - railroady
 extensions: []
-extra_rdoc_files:
-- AUTHORS.rdoc
-- CHANGELOG.rdoc
-- LICENSE.rdoc
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .document
+- .gitignore
 - AUTHORS.rdoc
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - LICENSE.rdoc
 - README.rdoc
 - Rakefile
-- VERSION.yml
 - bin/railroady
 - lib/railroady.rb
 - lib/railroady/aasm_diagram.rb
@@ -49,29 +115,58 @@ files:
 - lib/railroady/options_struct.rb
 - lib/railroady/railtie.rb
 - lib/railroady/version.rb
+- railroady.gemspec
 - tasks/railroady.rake
+- test/file_fixture/app/controllers/application_controller.rb
+- test/file_fixture/app/controllers/dummy1_controller.rb
+- test/file_fixture/app/controllers/dummy2_controller.rb
+- test/file_fixture/app/controllers/sub-dir/sub_dummy_controller.rb
+- test/file_fixture/app/models/dummy1.rb
+- test/file_fixture/app/models/dummy2.rb
+- test/file_fixture/app/models/sub-dir/sub_dummy.rb
+- test/lib/railroady/aasm_diagram_spec.rb
+- test/lib/railroady/app_diagram_spec.rb
+- test/lib/railroady/controllers_diagram_spec.rb
+- test/lib/railroady/core_ext_spec.rb
+- test/lib/railroady/diagram_graph_spec.rb
+- test/lib/railroady/models_diagram_spec.rb
+- test/spec_helper.rb
 homepage: http://github.com/preston/railroady
-licenses: []
+licenses:
+- GPLv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Ruby on Rails 3 model and controller UML class diagram generator.
-test_files: []
+specification_version: 4
+summary: Ruby on Rails 3/4 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
+- test/file_fixture/app/controllers/dummy2_controller.rb
+- test/file_fixture/app/controllers/sub-dir/sub_dummy_controller.rb
+- test/file_fixture/app/models/dummy1.rb
+- test/file_fixture/app/models/dummy2.rb
+- test/file_fixture/app/models/sub-dir/sub_dummy.rb
+- test/lib/railroady/aasm_diagram_spec.rb
+- test/lib/railroady/app_diagram_spec.rb
+- test/lib/railroady/controllers_diagram_spec.rb
+- test/lib/railroady/core_ext_spec.rb
+- test/lib/railroady/diagram_graph_spec.rb
+- test/lib/railroady/models_diagram_spec.rb
+- test/spec_helper.rb

data/.document

@@ -1,7 +0,0 @@
-README.rdoc
-CHANGELOG.rdoc
-AUTHORS.rdoc
-LICENSE.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 1
-:minor: 1
-:patch: 0
-:build: