@@ -30,10 +30,8 @@ class ControllersDiagram < AppDiagram def load_classes begin disable_stdout - # ApplicationController must be loaded first - require "app/controllers/application_controller.rb" files = Dir.glob("app/controllers/**/*_controller.rb") - @options.exclude - files.each {|c| require c } + files.each {|file| get_controller_class(file) } enable_stdout rescue LoadError enable_stdout @@ -42,6 +40,22 @@ class ControllersDiagram < 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 controller names we're asked to process + # Check for namespaced controllers in subdirectories as well as controllers + # in subdirectories without namespacing. + def get_controller_class(file) + model = file.sub(/^.*app\/controllers\//, '').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 + # Proccess a controller class def process_class(current_class) lib/railroad/controllers_diagram.rb a8815fc3ba8df8db44d078dbf2046ddf99538120 Bruno Michel bmichel@menfin.info http://github.com/ddollar/railroad/commit/96fb1c540dfc8e2300969e4778a7c7bff9563c59 96fb1c540dfc8e2300969e4778a7c7bff9563c59 2009-03-13T07:12:57-07:00 2009-03-13T07:12:57-07:00 Use autoload insted of require for controllers to avoid loading them twice 98528b9301f353062fe080d712a3ee7d4d7d32e3 Bruno Michel bmichel@menfin.info