@@ -136,3 +136,4 @@ Tien Dung http://github.com/tiendung Factory Design Labs http://github.com/factorylabs Mike Mondragon http://github.com/monde Tero Tilus http://github.com/terotil +Bruno Michel http://github.com/nono README.txt @@ -1,6 +1,6 @@ APP_NAME = "railroad" APP_HUMAN_NAME = "RailRoad" -APP_VERSION = [0,7,3] +APP_VERSION = [0,7,4] COPYRIGHT = "Copyright (C) 2007-2008 Javier Smaldone" require 'railroad/options_struct' lib/railroad.rb @@ -28,7 +28,7 @@ class AasmDiagram < AppDiagram end end - private +private # Load model classes def load_classes @@ -37,7 +37,7 @@ class AasmDiagram < AppDiagram files = Dir.glob("app/models/**/*.rb") files += Dir.glob("vendor/plugins/**/app/models/*.rb") if @options.plugins_models files -= @options.exclude - files.each {|m| require m } + files.each {|file| get_model_class(file) } enable_stdout rescue LoadError enable_stdout @@ -46,6 +46,22 @@ class AasmDiagram < AppDiagram end end # load_classes + # This method is taken from the annotate models gem + # http://github.com/ctran/annotate_models/tree/master + # + # Retrieve the classes belonging to the model names we're asked to process + # Check for namespaced models in subdirectories as well as models + # in subdirectories without namespacing. + def get_model_class(file) + model = file.sub(/^.*app\/models\//, '').sub(/\.rb$/, '').camelize + parts = model.split('::') + begin + parts.inject(Object) {|klass, part| klass.const_get(part) } + rescue LoadError + Object.const_get(parts.last) + end + end + # Process a model class def process_class(current_class) lib/railroad/aasm_diagram.rb @@ -63,9 +63,7 @@ class ModelsDiagram < AppDiagram files = Dir.glob("app/models/**/*.rb") files += Dir.glob("vendor/plugins/**/app/models/*.rb") if @options.plugins_models files -= @options.exclude - files.each do |m| - require m - end + files.each {|file| get_model_class(file) } enable_stdout rescue LoadError enable_stdout @@ -74,6 +72,22 @@ class ModelsDiagram < AppDiagram end end # load_classes + # This method is taken from the annotate models gem + # http://github.com/ctran/annotate_models/tree/master + # + # Retrieve the classes belonging to the model names we're asked to process + # Check for namespaced models in subdirectories as well as models + # in subdirectories without namespacing. + def get_model_class(file) + model = file.sub(/^.*app\/models\//, '').sub(/\.rb$/, '').camelize + parts = model.split('::') + begin + parts.inject(Object) {|klass, part| klass.const_get(part) } + rescue LoadError + Object.const_get(parts.last) + end + end + # Process a model class def process_class(current_class) lib/railroad/models_diagram.rb @@ -1,24 +1,23 @@ Gem::Specification.new do |s| - s.name = %q{railroad} - s.version = "0.7.3" - + s.name = "railroad" + s.version = "0.7.4" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Javier Smaldone", "Thomas Ritz", "Tien Dung", "Factory Design Labs", "Mike Mondragon", "Tero Tilus", "David Dollar"] - s.date = %q{2009-02-18} - s.default_executable = %q{railroad} - s.description = %q{} - s.email = %q{javier@smaldone.com.ar} + s.authors = ["Javier Smaldone", "Thomas Ritz", "Tien Dung", "Factory Design Labs", "Mike Mondragon", "Tero Tilus", "David Dollar", "Bruno Michel"] + s.date = "2009-03-13" + s.default_executable = "railroad" + s.description = "RailRoad is a class diagrams generator for Ruby on Rails applications." + s.email = "javier@smaldone.com.ar" s.executables = ["railroad"] s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"] s.files = ["COPYING", "ChangeLog", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "bin/railroad", "init.rb", "lib/railroad.rb", "lib/railroad/aasm_diagram.rb", "lib/railroad/app_diagram.rb", "lib/railroad/controllers_diagram.rb", "lib/railroad/diagram_graph.rb", "lib/railroad/models_diagram.rb", "lib/railroad/options_struct.rb", "tasks/diagrams.rake"] s.has_rdoc = true - s.homepage = %q{http://railroad.rubyforge.org} + s.homepage = "http://railroad.rubyforge.org" s.rdoc_options = ["--main", "README.txt"] s.require_paths = ["lib"] - s.rubyforge_project = %q{railroad} - s.rubygems_version = %q{1.2.0} - s.summary = %q{A DOT diagram generator for Ruby on Rail applications} + s.rubyforge_project = "railroad" + s.rubygems_version = "1.2.0" + s.summary = "A DOT diagram generator for Ruby on Rail applications" if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION railroad.gemspec 7c6d7314b3286ac0569bfca156b0ad34ad96329f Bruno Michel bmichel@menfin.info http://github.com/ddollar/railroad/commit/70b77a233d298356178a10f253f8d201cf5cad40 70b77a233d298356178a10f253f8d201cf5cad40 2009-03-13T06:08:03-07:00 2009-03-13T06:08:03-07:00 Use autoload insted of require for models to avoid loading them twice 204a4508f2b76113ef3543f17b16c18159ce53cc Bruno Michel bmichel@menfin.info