Backed out of routing merge.. investigating missing patches

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

17 files changed, 92 insertions, 116 deletions

diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb
index 92a54e2453..065ce63966 100644
--- a/railties/lib/rails_generator/base.rb
+++ b/railties/lib/rails_generator/base.rb
@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/support/class_attribute_accessors'
-require File.dirname(__FILE__) + '/support/inflector'
+require File.dirname(__FILE__) + '/../support/class_attribute_accessors'
+require File.dirname(__FILE__) + '/../support/inflector'
 require File.dirname(__FILE__) + '/options'
 require File.dirname(__FILE__) + '/manifest'
 require File.dirname(__FILE__) + '/spec'
@@ -69,8 +69,8 @@ module Rails
         @source_root = options[:source] || File.join(spec.path, 'templates')
         if options[:destination]
           @destination_root = options[:destination]
-        elsif defined? ::RAILS_ROOT
-          @destination_root = ::RAILS_ROOT
+        elsif Object.const_defined?(:RAILS_ROOT)
+          @destination_root = Object.const_get(:RAILS_ROOT)
         end
 
         # Silence the logger if requested.
@@ -173,20 +173,11 @@ module Rails
         def assign_names!(name)
           @name = name
           base_name, @class_path, @class_nesting = extract_modules(@name)
-          @class_name_without_nesting, @singular_name, @plural_name = inflect_names(base_name)
-          if @class_nesting.empty?
-            @class_name = @class_name_without_nesting
-          else
-            @class_name = "#{@class_nesting}::#{@class_name_without_nesting}"
-          end
+          @class_name, @singular_name, @plural_name = inflect_names(base_name)
         end
 
-        # Extract modules from filesystem-style or ruby-style path:
-        #   good/fun/stuff
-        #   Good::Fun::Stuff
-        # produce the same results.
         def extract_modules(name)
-          modules = name.include?('/') ? name.split('/') : name.split('::')
+          modules = name.split('/')
           name    = modules.pop
           path    = modules.map { |m| m.underscore }
           nesting = modules.map { |m| m.camelize }.join('::')
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 4a04757ddd..0beb11b237 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -1,16 +1,15 @@
-require 'rbconfig'
-
 class AppGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
 
   default_options   :gem => true, :shebang => DEFAULT_SHEBANG
-  mandatory_options :source  => "#{File.dirname(__FILE__)}/../../../../.."
+  mandatory_options :source  => "#{File.dirname(__FILE__)}/../.."
 
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
     @destination_root = args.shift
+    puts "eek! #{destination_root.inspect}"
   end
 
   def manifest
@@ -33,7 +32,6 @@ class AppGenerator < Rails::Generator::Base
 
       # database.yml and .htaccess
       m.template "configs/database.yml", "config/database.yml"
-      m.template "configs/routes.rb", "config/routes.rb"
       m.template "configs/apache.conf", "public/.htaccess"
 
       # Environments
diff --git a/railties/lib/rails_generator/generators/components/controller/controller_generator.rb b/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
index d537031fea..1f7e69d124 100644
--- a/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
+++ b/railties/lib/rails_generator/generators/components/controller/controller_generator.rb
@@ -4,11 +4,8 @@ class ControllerGenerator < Rails::Generator::NamedBase
       # Check for class naming collisions.
       m.class_collisions "#{class_name}Controller", "#{class_name}ControllerTest", "#{class_name}Helper"
 
-      # Controller, helper, views, and test directories.
-      m.directory File.join('app/controllers', class_path)
-      m.directory File.join('app/helpers', class_path)
+      # Views directory even if there are no actions.
       m.directory File.join('app/views', class_path, file_name)
-      m.directory File.join('test/functional', class_path)
 
       # Controller class, functional test, and helper class.
       m.template 'controller.rb',
diff --git a/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb
index 76e2b33ba5..c975cb3ce3 100644
--- a/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb
+++ b/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb
@@ -7,8 +7,7 @@ class <%= class_name %>Controller; def rescue_action(e) raise e end; end
 class <%= class_name %>ControllerTest < Test::Unit::TestCase
   def setup
     @controller = <%= class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
   end
 
   # Replace this with your real tests.
diff --git a/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb b/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
index d8ddb43644..81d4599f7f 100644
--- a/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
+++ b/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
@@ -4,28 +4,21 @@ class MailerGenerator < Rails::Generator::NamedBase
       # Check for class naming collisions.
       m.class_collisions class_name, "#{class_name}Test"
 
-      # Mailer, view, test, and fixture directories.
-      m.directory File.join('app/models', class_path)
-      m.directory File.join('app/views', class_path, file_name)
-      m.directory File.join('test/unit', class_path)
-      m.directory File.join('test/fixtures', class_path, table_name)
-
       # Mailer class and unit test.
-      m.template "mailer.rb",    File.join('app/models',
-                                           class_path,
-                                           "#{file_name}.rb")
-      m.template "unit_test.rb", File.join('test/unit',
-                                           class_path,
-                                           "#{file_name}_test.rb")
+      m.template "mailer.rb",    "app/models/#{file_name}.rb"
+      m.template "unit_test.rb", "test/unit/#{file_name}_test.rb"
+
+      # Views and fixtures directories.
+      m.directory "app/views/#{file_name}"
+      m.directory "test/fixtures/#{table_name}"
 
       # View template and fixture for each action.
       actions.each do |action|
         m.template "view.rhtml",
-                   File.join('app/views', class_path, file_name, "#{action}.rhtml"),
+                   "app/views/#{file_name}/#{action}.rhtml",
                    :assigns => { :action => action }
         m.template "fixture.rhtml",
                    "test/fixtures/#{table_name}/#{action}",
-                   File.join('test/fixtures', class_path, table_name, action),
                    :assigns => { :action => action }
       end
     end
diff --git a/railties/lib/rails_generator/generators/components/model/model_generator.rb b/railties/lib/rails_generator/generators/components/model/model_generator.rb
index c3407ca283..32577d08a3 100644
--- a/railties/lib/rails_generator/generators/components/model/model_generator.rb
+++ b/railties/lib/rails_generator/generators/components/model/model_generator.rb
@@ -4,11 +4,6 @@ class ModelGenerator < Rails::Generator::NamedBase
       # Check for class naming collisions.
       m.class_collisions class_name, "#{class_name}Test"
 
-      # Model, test, and fixture directories.
-      m.directory File.join('app/models', class_path)
-      m.directory File.join('test/unit', class_path)
-      m.directory File.join('test/fixtures', class_path)
-
       # Model class, unit test, and fixtures.
       m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
       m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
diff --git a/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml b/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml
index 6285727968..fc3185dc46 100644
--- a/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml
+++ b/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml
@@ -1,8 +1,10 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 # Set the $base_id variable in the setup method of your tests.
 # It's used to ensure that ids don't clash in some databases.
+<%% $base_id ||= 100000 %>
+
 first_<%= singular_name %>:
-  id: 1
+  id: <%%= $base_id %>
 
 another_<%= singular_name %>:
-  id: 2
+  id: <%%= $base_id + 1 %>
diff --git a/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb b/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb
index e8714b589a..db0fbf5d33 100644
--- a/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb
+++ b/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb
@@ -4,11 +4,11 @@ class <%= class_name %>Test < Test::Unit::TestCase
   fixtures :<%= table_name %>
 
   def setup
-    @<%= singular_name %> = <%= class_name %>.find(1)
+    $base_id = 1000001
   end
 
   # Replace this with your real tests.
   def test_truth
-    assert_kind_of <%= class_name %>,  @<%= singular_name %>
+    assert true
   end
 end
diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
index abf9d79ffe..4445995b46 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
@@ -41,12 +41,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
     super
     @controller_name = args.shift || @name.pluralize
     base_name, @controller_class_path, @controller_class_nesting = extract_modules(@controller_name)
-    @controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
-    if @controller_class_nesting.empty?
-      @controller_class_name = @controller_class_name_without_nesting
-    else
-      @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
-    end
+    @controller_class_name, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
   end
 
   def manifest
@@ -57,12 +52,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       # Check for class naming collisions.
       m.class_collisions "#{controller_class_name}Controller", "#{controller_class_name}ControllerTest", "#{controller_class_name}Helper"
 
-      # Controller, helper, views, and test directories.
-      m.directory File.join('app/controllers', controller_class_path)
-      m.directory File.join('app/helpers', controller_class_path)
+      # Views directory.
       m.directory File.join('app/views', controller_class_path, controller_file_name)
-      m.directory File.join('test/functional', controller_class_path)
-
 
       # Controller class, functional test, helper, and views.
       m.template 'controller.rb',
@@ -88,8 +79,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       scaffold_views.each do |action|
         m.template "view_#{action}.rhtml",
                    File.join('app/views',
-                             controller_class_path,
-                             controller_file_name,
+                             controller_class_path, controller_file_name,
                              "#{action}.rhtml"),
                    :assigns => { :action => action }
       end
@@ -113,8 +103,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       unscaffolded_actions.each do |action|
         m.template "controller:view.rhtml",
                    File.join('app/views',
-                             controller_class_path,
-                             controller_file_name,
+                             controller_class_path, controller_file_name,
                              "#{action}.rhtml"),
                    :assigns => { :action => action }
       end
@@ -164,13 +153,9 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
     end
 
     def model_instance
-      base = class_nesting.split('::').inject(Object) do |base, nested|
-        break base.const_get(nested) if base.const_defined?(nested)
-        base.const_set(nested, Module.new)
-      end
-      unless base.const_defined?(@class_name_without_nesting)
-        base.const_set(@class_name_without_nesting, Class.new(ActiveRecord::Base))
+      unless Object.const_defined?(class_name)
+        Object.const_set(class_name, Class.new(ActiveRecord::Base))
       end
-      class_name.constantize.new
+      Object.const_get(class_name).new
     end
 end
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
index 32185fb715..ea9c8e4e94 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
@@ -8,9 +8,9 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
   fixtures :<%= table_name %>
 
   def setup
+    $base_id = 1000001
     @controller = <%= controller_class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
   end
 
 <% for action in unscaffolded_actions -%>
@@ -34,7 +34,7 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
   end
 
   def test_show<%= suffix %>
-    process :show<%= suffix %>, 'id' => 1
+    process :show<%= suffix %>, 'id' => $base_id
     assert_rendered_file 'show'
     assert_template_has '<%= singular_name %>'
     assert_valid_record '<%= singular_name %>'
@@ -56,25 +56,25 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
   end
 
   def test_edit<%= suffix %>
-    process :edit<%= suffix %>, 'id' => 1
+    process :edit<%= suffix %>, 'id' => $base_id
     assert_rendered_file 'edit<%= suffix %>'
     assert_template_has '<%= singular_name %>'
     assert_valid_record '<%= singular_name %>'
   end
 
   def test_update<%= suffix %>
-    process :update<%= suffix %>, '<%= singular_name %>' => { 'id' => 1 }
-    assert_redirected_to :action => 'show<%= suffix %>', :id => 1
+    process :update<%= suffix %>, '<%= singular_name %>' => { 'id' => $base_id }
+    assert_redirected_to :action => 'show<%= suffix %>', :id => $base_id
   end
 
   def test_destroy<%= suffix %>
-    assert_not_nil <%= class_name %>.find(1)
+    assert_not_nil <%= class_name %>.find($base_id)
 
-    process :destroy, 'id' => 1
+    process :destroy, 'id' => $base_id
     assert_redirected_to :action => 'list<%= suffix %>'
 
     assert_raise(ActiveRecord::RecordNotFound) {
-      <%= singular_name %> = <%= class_name %>.find(1)
+      <%= singular_name %> = <%= class_name %>.find($base_id)
     }
   end
 end
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml b/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml
index e0d56d1122..068fd67472 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml
@@ -10,7 +10,7 @@
 <%% for <%= singular_name %> in @<%= plural_name %> %>
   <tr>
   <%% for column in <%= class_name %>.content_columns %>
-    <td><%%=h <%= singular_name %>.send(column.name) %></td>
+    <td><%%=h <%= singular_name %>[column.name] %></td>
   <%% end %>
     <td><%%= link_to 'Show', :action => 'show<%= suffix %>', :id => <%= singular_name %>.id %></td>
     <td><%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => <%= singular_name %>.id %></td>
diff --git a/railties/lib/rails_generator/lookup.rb b/railties/lib/rails_generator/lookup.rb
index 00b78ce645..ba47fd79be 100644
--- a/railties/lib/rails_generator/lookup.rb
+++ b/railties/lib/rails_generator/lookup.rb
@@ -4,20 +4,24 @@ class Object
   class << self
     # Lookup missing generators using const_missing.  This allows any
     # generator to reference another without having to know its location:
-    # RubyGems, ~/.rails/generators, and RAILS_ROOT/script/generators.
-    def lookup_missing_generator(class_id)
-      if md = /(.+)Generator$/.match(class_id.to_s)
-        name = md.captures.first.demodulize.underscore
-        Rails::Generator::Base.lookup(name).klass
-      else
-        const_missing_before_generators(class_id)
+    # RubyGems, ~/.rails/generators, and RAILS_ROOT/script/generators all
+    # cooperate to get the job done.  The greatest use of const_missing
+    # autoloading is to easily subclass existing generators.  Example:
+    #   class HorsebackGenerator < PostbackGenerator
+    # We don't know whether the postback generator is built in, installed
+    # as a gem, or in the user's home directory, and we shouldn't have to.
+    unless respond_to?(:pre_generator_const_missing)
+      alias_method :pre_generator_const_missing, :const_missing
+
+      def const_missing(class_id)
+        if md = /(.+)Generator$/.match(class_id.to_s)
+          name = md.captures.first.demodulize.underscore
+          Rails::Generator::Base.lookup(name).klass
+        else
+          pre_generator_const_missing(class_id)
+        end
       end
     end
-
-    unless respond_to?(:const_missing_before_generators)
-      alias_method :const_missing_before_generators, :const_missing
-      alias_method :const_missing, :lookup_missing_generator
-    end
   end
 end
 
@@ -98,7 +102,7 @@ module Rails
         # 4.  Builtins.  Model, controller, mailer, scaffold.
         def use_component_sources!
           reset_sources
-          sources << PathSource.new(:app, "#{::RAILS_ROOT}/script/generators") if defined? ::RAILS_ROOT
+          sources << PathSource.new(:app, "#{Object.const_get(:RAILS_ROOT)}/script/generators") if Object.const_defined?(:RAILS_ROOT)
           sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
           sources << GemSource.new if Object.const_defined?(:Gem)
           sources << PathSource.new(:builtin, "#{File.dirname(__FILE__)}/generators/components")
diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb
index 54785413ef..afe2d31625 100644
--- a/railties/lib/rails_generator/options.rb
+++ b/railties/lib/rails_generator/options.rb
@@ -1,12 +1,8 @@
 require 'optparse'
-require File.dirname(__FILE__) + '/support/class_inheritable_attributes'
+require File.dirname(__FILE__) + '/../support/class_inheritable_attributes'
 
 module Rails
   module Generator
-    # Implement add_options! to add your options to the parser:
-    #   def add_options!(opt)
-    #     opt.on('-v', '--verbose') { |value| options[:verbose] = value }
-    #   end
     module Options
       def self.append_features(base)
         super
@@ -89,14 +85,13 @@ module Rails
 
           @option_parser = OptionParser.new do |opt|
             opt.banner = banner
-            add_options!(opt) if respond_to?(:add_options!)
+            add_options!(opt)
             add_general_options!(opt)
             opt.parse!(args)
           end
 
-          return args
-        ensure
           self.options = full_options(runtime_options)
+          args
         end
 
         # Raise a usage error.  Override usage_message to provide a blurb
@@ -114,6 +109,14 @@ module Rails
           "Usage: #{$0} [options]"
         end
 
+        # Override with a method that adds options to the parser.
+        # Added options should use the options hash.  For example,
+        #   def add_options!(opt)
+        #     opt.on('-v', '--verbose') { |value| options[:verbose] = value }
+        #   end
+        def add_options!(opt)
+        end
+
         # Adds general options like -h and --quiet.  Usually don't override.
         def add_general_options!(opt)
           opt.separator ''
diff --git a/railties/lib/rails_generator/scripts.rb b/railties/lib/rails_generator/scripts.rb
index f0b6b6f1ff..007980dcb5 100644
--- a/railties/lib/rails_generator/scripts.rb
+++ b/railties/lib/rails_generator/scripts.rb
@@ -16,23 +16,21 @@ module Rails
         # or first remaining argument, and invokes the requested command.
         def run(args = [], runtime_options = {})
           begin
-            parse!(args.dup, runtime_options)
-          rescue OptionParser::InvalidOption => e
-            # Don't cry, script. Generators want what you think is invalid.
-          end
+            parse!(args, runtime_options)
 
-          # Generator name is the only required option.
-          unless options[:generator]
-            usage if args.empty?
-            options[:generator] ||= args.shift
-          end
+            # Generator name is the only required option.
+            unless options[:generator]
+              usage if args.empty?
+              options[:generator] ||= args.shift
+            end
 
-          # Look up generator instance and invoke command on it.
-          Rails::Generator::Base.instance(options[:generator], args, options).command(options[:command]).invoke!
-        rescue => e
-          puts e
-          puts "  #{e.backtrace.join("\n  ")}\n" if options[:backtrace]
-          raise SystemExit
+            # Look up generator instance and invoke command on it.
+            Rails::Generator::Base.instance(options[:generator], args, options).command(options[:command]).invoke!
+          rescue => e
+            puts e
+            puts "  #{e.backtrace.join("\n  ")}\n" if options[:backtrace]
+            raise SystemExit
+          end
         end
 
         protected
diff --git a/railties/lib/rails_generator/scripts/destroy.rb b/railties/lib/rails_generator/scripts/destroy.rb
index 628ec4de32..fd8469fbc7 100644
--- a/railties/lib/rails_generator/scripts/destroy.rb
+++ b/railties/lib/rails_generator/scripts/destroy.rb
@@ -3,5 +3,9 @@ require File.dirname(__FILE__) + '/../scripts'
 module Rails::Generator::Scripts
   class Destroy < Base
     mandatory_options :command => :destroy
+
+    protected
+      def add_options!(opt)
+      end
   end
 end
diff --git a/railties/lib/rails_generator/scripts/generate.rb b/railties/lib/rails_generator/scripts/generate.rb
index 1fe2f54ab3..329d6691df 100644
--- a/railties/lib/rails_generator/scripts/generate.rb
+++ b/railties/lib/rails_generator/scripts/generate.rb
@@ -3,5 +3,9 @@ require File.dirname(__FILE__) + '/../scripts'
 module Rails::Generator::Scripts
   class Generate < Base
     mandatory_options :command => :create
+
+    protected
+      def add_options!(opt)
+      end
   end
 end
diff --git a/railties/lib/rails_generator/scripts/update.rb b/railties/lib/rails_generator/scripts/update.rb
index 53a9faa366..ad1ae8004a 100644
--- a/railties/lib/rails_generator/scripts/update.rb
+++ b/railties/lib/rails_generator/scripts/update.rb
@@ -5,6 +5,9 @@ module Rails::Generator::Scripts
     mandatory_options :command => :update
 
     protected
+      def add_options!(opt)
+      end
+
       def banner
         "Usage: #{$0} [options] scaffold"
       end