1 files changed, 32 insertions, 37 deletions

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index cd277c5097..d9a91b74d1 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -23,40 +23,41 @@ module Rails
     mattr_accessor :namespace
 
     DEFAULT_ALIASES = {
-      :rails => {
-        :actions => '-a',
-        :orm => '-o',
-        :javascripts => '-j',
-        :javascript_engine => '-je',
-        :resource_controller => '-c',
-        :scaffold_controller => '-c',
-        :stylesheets => '-y',
-        :stylesheet_engine => '-se',
-        :template_engine => '-e',
-        :test_framework => '-t'
+      rails: {
+        actions: '-a',
+        orm: '-o',
+        javascripts: '-j',
+        javascript_engine: '-je',
+        resource_controller: '-c',
+        scaffold_controller: '-c',
+        stylesheets: '-y',
+        stylesheet_engine: '-se',
+        template_engine: '-e',
+        test_framework: '-t'
       },
 
-      :test_unit => {
-        :fixture_replacement => '-r',
+      test_unit: {
+        fixture_replacement: '-r',
       }
     }
 
     DEFAULT_OPTIONS = {
-      :rails => {
-        :assets => true,
-        :force_plural => false,
-        :helper => true,
-        :integration_tool => nil,
-        :javascripts => true,
-        :javascript_engine => :js,
-        :orm => false,
-        :performance_tool => nil,
-        :resource_controller => :controller,
-        :scaffold_controller => :scaffold_controller,
-        :stylesheets => true,
-        :stylesheet_engine => :css,
-        :test_framework => false,
-        :template_engine => :erb
+      rails: {
+        assets: true,
+        force_plural: false,
+        helper: true,
+        integration_tool: nil,
+        javascripts: true,
+        javascript_engine: :js,
+        orm: false,
+        performance_tool: nil,
+        resource_controller: :controller,
+        resource_route: true,
+        scaffold_controller: :scaffold_controller,
+        stylesheets: true,
+        stylesheet_engine: :css,
+        test_framework: false,
+        template_engine: :erb
       }
     }
 
@@ -70,7 +71,7 @@ module Rails
       hide_namespaces(*config.hidden_namespaces)
     end
 
-    def self.templates_path
+    def self.templates_path #:nodoc:
       @templates_path ||= []
     end
 
@@ -94,7 +95,6 @@ module Rails
     # some of them are not available by adding a fallback:
     #
     #   Rails::Generators.fallbacks[:shoulda] = :test_unit
-    #
     def self.fallbacks
       @fallbacks ||= {}
     end
@@ -114,8 +114,6 @@ module Rails
     # Generators names must end with "_generator.rb". This is required because Rails
     # looks in load paths and loads the generator just before it's going to be used.
     #
-    # ==== Examples
-    #
     #   find_by_namespace :webrat, :rails, :integration
     #
     # Will search for the following generators:
@@ -124,7 +122,6 @@ module Rails
     #
     # Notice that "rails:generators:webrat" could be loaded as well, what
     # Rails looks for is the first and last parts of the namespace.
-    #
     def self.find_by_namespace(name, base=nil, context=nil) #:nodoc:
       lookups = []
       lookups << "#{base}:#{name}"    if base
@@ -172,16 +169,14 @@ module Rails
 
         [
           "rails",
+          "resource_route",
           "#{orm}:migration",
           "#{orm}:model",
-          "#{orm}:observer",
-          "#{orm}:session_migration",
           "#{test}:controller",
           "#{test}:helper",
           "#{test}:integration",
           "#{test}:mailer",
           "#{test}:model",
-          "#{test}:observer",
           "#{test}:scaffold",
           "#{test}:view",
           "#{test}:performance",
@@ -235,7 +230,7 @@ module Rails
       rails.delete("plugin_new")
       print_list("rails", rails)
 
-      hidden_namespaces.each {|n| groups.delete(n.to_s) }
+      hidden_namespaces.each { |n| groups.delete(n.to_s) }
 
       groups.sort.each { |b, n| print_list(b, n) }
     end