Merge branch 'master' of github.com:rails/rails

19 files changed, 167 insertions, 142 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index d88036f829..daffd8ce30 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -6,6 +6,7 @@ require 'rake/gempackagetask'
 require 'date'
 require 'rbconfig'
 
+
 task :default => :test
 task :test => 'test:isolated'
 
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 38a5aa8ca3..7cec14c738 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -112,15 +112,15 @@ module Rails
 
     def load_tasks
       initialize_tasks
-      super
       railties.all { |r| r.load_tasks }
+      super
       self
     end
 
     def load_generators
       initialize_generators
-      super
       railties.all { |r| r.load_generators }
+      super
       self
     end
 
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 11bf6a6e72..874b3a78b6 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -128,13 +128,13 @@ module Rails
         end
       end
 
-    protected
-
       def session_options
         return @session_options unless @session_store == :cookie_store
         @session_options.merge(:secret => @secret_token)
       end
 
+    protected
+
       def default_middleware_stack
         ActionDispatch::MiddlewareStack.new.tap do |middleware|
           middleware.use('::ActionDispatch::Static', lambda { paths.public.to_a.first }, :if => lambda { serve_static_assets })
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 68982b9f52..8957f11724 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -1,6 +1,7 @@
 require 'erb'
 require 'yaml'
 require 'optparse'
+require 'rbconfig'
 
 module Rails
   class DBConsole
@@ -41,7 +42,7 @@ module Rails
 
       def find_cmd(*commands)
         dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
-        commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/
+        commands += commands.map{|cmd| "#{cmd}.exe"} if Config::CONFIG['host_os'] =~ /mswin|mingw/
 
         full_path_command = nil
         found = commands.detect do |cmd|
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index 5634ee0f69..1dd11e1241 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -1,4 +1,5 @@
 require 'optparse'
+require 'rbconfig'
 
 options = { :environment => (ENV['RAILS_ENV'] || "development").dup }
 code_or_file = nil
@@ -18,7 +19,7 @@ ARGV.clone.options do |opts|
   opts.on("-h", "--help",
           "Show this help message.") { $stderr.puts opts; exit }
 
-  if RUBY_PLATFORM !~ /mswin|mingw/
+  if Config::CONFIG['host_os'] !~ /mswin|mingw/
     opts.separator ""
     opts.separator "You can also use runner as a shebang line for your scripts like this:"
     opts.separator "-------------------------------------------------------------"
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 98da7e2b4a..36fcc896ae 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -1,6 +1,7 @@
 require 'rails/railtie'
 require 'active_support/core_ext/module/delegation'
 require 'pathname'
+require 'rbconfig'
 
 module Rails
   # Rails::Engine allows you to wrap a specific Rails application and share it accross
@@ -119,7 +120,7 @@ module Rails
         root = File.exist?("#{root_path}/#{flag}") ? root_path : default
         raise "Could not find root path for #{self}" unless root
 
-        RUBY_PLATFORM =~ /mswin|mingw/ ?
+        Config::CONFIG['host_os'] =~ /mswin|mingw/ ?
           Pathname.new(root).expand_path : Pathname.new(root).realpath
       end
     end
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 7dec4d446a..a31932906d 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -1,5 +1,6 @@
 require 'open-uri'
 require 'active_support/deprecation'
+require 'rbconfig'
 
 module Rails
   module Generators
@@ -240,7 +241,7 @@ module Rails
       def rake(command, options={})
         log :rake, command
         env  = options[:env] || 'development'
-        sudo = options[:sudo] && RUBY_PLATFORM !~ /mswin|mingw/ ? 'sudo ' : ''
+        sudo = options[:sudo] && Config::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
         in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) }
       end
 
@@ -307,7 +308,7 @@ module Rails
         # Add an extension to the given name based on the platform.
         #
         def extify(name)
-          if RUBY_PLATFORM =~ /mswin|mingw/
+          if Config::CONFIG['host_os'] =~ /mswin|mingw/
             "#{name}.bat"
           else
             name
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
index 4dd2e6bf8c..6b3518717a 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
@@ -1,4 +1,4 @@
-<p class="notice"><%%= notice %></p>
+<p id="notice"><%%= notice %></p>
 
 <% for attribute in attributes -%>
 <p>
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 6818fafbe9..aa066fe3c4 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -1,6 +1,7 @@
 require 'digest/md5'
 require 'active_support/secure_random'
 require 'rails/version' unless defined?(Rails::VERSION)
+require 'rbconfig'
 
 module Rails::Generators
   # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
@@ -265,7 +266,7 @@ module Rails::Generators
           "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
           "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
           "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
-        ].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /mswin|mingw/
+        ].find { |f| File.exist?(f) } unless Config::CONFIG['host_os'] =~ /mswin|mingw/
       end
 
       def empty_directory_with_gitkeep(destination, config = {})
diff --git a/railties/lib/rails/generators/rails/app/templates/Rakefile b/railties/lib/rails/generators/rails/app/templates/Rakefile
index 9cb2046439..13f1f9fa41 100755
--- a/railties/lib/rails/generators/rails/app/templates/Rakefile
+++ b/railties/lib/rails/generators/rails/app/templates/Rakefile
@@ -2,9 +2,6 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
 
 Rails::Application.load_tasks
diff --git a/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
index 9f2056a702..1ae7000299 100644
--- a/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
+++ b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
@@ -20,15 +20,11 @@ div.field, div.actions {
   margin-bottom: 10px;
 }
 
-.notice {
+#notice {
   color: green;
 }
 
-.alert {
-  color: red;
-}
-
-.fieldWithErrors {
+.field_with_errors {
   padding: 2px;
   background-color: red;
   display: table;
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 957c375f6a..19d1fd2354 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,3 +1,5 @@
+require 'rake/rdoctask'
+
 namespace :doc do
   def gem_path(gem_name)
     path = $LOAD_PATH.grep(/#{gem_name}[\w.-]*\/lib$/).first
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 3ce4e2c780..ec5e4a357c 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -35,7 +35,9 @@ class ActionController::TestCase
 end
 
 class ActionDispatch::IntegrationTest
-  include Rails.application.routes.url_helpers
+  setup do
+    @routes = Rails.application.routes
+  end
 end
 
 begin
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 83f25506cb..79fa667ed1 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -1,3 +1,5 @@
+require 'rake/testtask'
+
 TEST_CHANGES_SINCE = Time.now - 600
 
 # Look up tests for recently modified sources.
@@ -30,7 +32,7 @@ end
 module Kernel
   def silence_stderr
     old_stderr = STDERR.dup
-    STDERR.reopen(RUBY_PLATFORM =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    STDERR.reopen(Config::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
     STDERR.sync = true
     yield
   ensure
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 4f1fc3c299..dfc4e2359b 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -109,7 +109,7 @@ module ApplicationTests
       end
     end
 
-    test "Frameworks are not preloaded by default" do
+    test "frameworks are not preloaded by default" do
       require "#{app_path}/config/environment"
 
       assert ActionController.autoload?(:RecordIdentifier)
@@ -193,71 +193,10 @@ module ApplicationTests
       assert_equal File.join(app_path, "somewhere"), Rails.public_path
     end
 
-    def make_basic_app
-      require "rails"
-      require "action_controller/railtie"
-
-      app = Class.new(Rails::Application)
-
-      yield app if block_given?
-
-      app.config.session_store :disabled
-      app.initialize!
-
-      app.routes.draw do
-        match "/" => "omg#index"
-      end
-
-      require 'rack/test'
-      extend Rack::Test::Methods
-    end
-
-    test "config.action_dispatch.x_sendfile_header defaults to ''" do
-      make_basic_app
-
-      class ::OmgController < ActionController::Base
-        def index
-          send_file __FILE__
-        end
-      end
-
-      get "/"
-      assert_equal File.read(__FILE__), last_response.body
-    end
-
-    test "config.action_dispatch.x_sendfile_header can be set" do
-      make_basic_app do |app|
-        app.config.action_dispatch.x_sendfile_header = "X-Sendfile"
-      end
-
-      class ::OmgController < ActionController::Base
-        def index
-          send_file __FILE__
-        end
-      end
-
-      get "/"
-      assert_equal File.expand_path(__FILE__), last_response.headers["X-Sendfile"]
-    end
-
-    test "config.action_dispatch.x_sendfile_header is sent to Rack::Sendfile" do
-      make_basic_app do |app|
-        app.config.action_dispatch.x_sendfile_header = 'X-Lighttpd-Send-File'
-      end
-
-      class ::OmgController < ActionController::Base
-        def index
-          send_file __FILE__
-        end
-      end
-
-      get "/"
-      assert_equal File.expand_path(__FILE__), last_response.headers["X-Lighttpd-Send-File"]
-    end
-
     test "config.secret_token is sent in env" do
       make_basic_app do |app|
         app.config.secret_token = 'ThisIsASECRET123'
+        app.config.session_store :disabled
       end
 
       class ::OmgController < ActionController::Base
@@ -287,9 +226,9 @@ module ApplicationTests
     end
 
     test "config.action_controller.perform_caching = true" do
-        make_basic_app do |app|
-          app.config.action_controller.perform_caching = true
-        end
+      make_basic_app do |app|
+        app.config.action_controller.perform_caching = true
+      end
 
       class ::OmgController < ActionController::Base
         @@count = 0
diff --git a/railties/test/application/middleware_stack_defaults_test.rb b/railties/test/application/middleware_stack_defaults_test.rb
deleted file mode 100644
index f31ca01fbf..0000000000
--- a/railties/test/application/middleware_stack_defaults_test.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'isolation/abstract_unit'
-
-class MiddlewareStackDefaultsTest < Test::Unit::TestCase
-  include ActiveSupport::Testing::Isolation
-
-  def setup
-    boot_rails
-    require "rails"
-    require "action_controller/railtie"
-
-    Object.const_set(:MyApplication, Class.new(Rails::Application))
-    MyApplication.class_eval do
-      config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
-      config.session_store :cookie_store, :key => "_myapp_session"
-    end
-  end
-
-  def remote_ip(env = {})
-    remote_ip = nil
-    env = Rack::MockRequest.env_for("/").merge(env).merge('action_dispatch.show_exceptions' => false)
-
-    endpoint = Proc.new do |e|
-      remote_ip = ActionDispatch::Request.new(e).remote_ip
-      [200, {}, ["Hello"]]
-    end
-
-    out = MyApplication.middleware.build(endpoint).call(env)
-    remote_ip
-  end
-
-  test "remote_ip works" do
-    assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "1.1.1.1")
-  end
-
-  test "checks IP spoofing by default" do
-    assert_raises(ActionDispatch::RemoteIp::IpSpoofAttackError) do
-      remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2")
-    end
-  end
-
-  test "can disable IP spoofing check" do
-    MyApplication.config.action_dispatch.ip_spoofing_check = false
-
-    assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do
-      assert_equal "1.1.1.2", remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2")
-    end
-  end
-
-  test "the user can set trusted proxies" do
-    MyApplication.config.action_dispatch.trusted_proxies = /^4\.2\.42\.42$/
-
-    assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "4.2.42.42,1.1.1.1")
-  end
-end
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 7f72881d55..27374dcb28 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -10,6 +10,10 @@ module ApplicationTests
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
+    def app
+      @app ||= Rails.application
+    end
+
     test "default middleware stack" do
       boot!
 
@@ -83,7 +87,83 @@ module ApplicationTests
       assert middleware.include?("ActionDispatch::Cascade")
     end
 
+    # x_sendfile_header middleware
+    test "config.action_dispatch.x_sendfile_header defaults to ''" do
+      make_basic_app
+
+      class ::OmgController < ActionController::Base
+        def index
+          send_file __FILE__
+        end
+      end
+
+      get "/"
+      assert_equal File.read(__FILE__), last_response.body
+    end
+
+    test "config.action_dispatch.x_sendfile_header can be set" do
+      make_basic_app do |app|
+        app.config.action_dispatch.x_sendfile_header = "X-Sendfile"
+      end
+
+      class ::OmgController < ActionController::Base
+        def index
+          send_file __FILE__
+        end
+      end
+
+      get "/"
+      assert_equal File.expand_path(__FILE__), last_response.headers["X-Sendfile"]
+    end
+
+    test "config.action_dispatch.x_sendfile_header is sent to Rack::Sendfile" do
+      make_basic_app do |app|
+        app.config.action_dispatch.x_sendfile_header = 'X-Lighttpd-Send-File'
+      end
+
+      class ::OmgController < ActionController::Base
+        def index
+          send_file __FILE__
+        end
+      end
+
+      get "/"
+      assert_equal File.expand_path(__FILE__), last_response.headers["X-Lighttpd-Send-File"]
+    end
+
+    # remote_ip tests
+    test "remote_ip works" do
+      make_basic_app
+      assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "1.1.1.1")
+    end
+
+    test "checks IP spoofing by default" do
+      make_basic_app
+      assert_raises(ActionDispatch::RemoteIp::IpSpoofAttackError) do
+        remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2")
+      end
+    end
+
+    test "can disable IP spoofing check" do
+      make_basic_app do |app|
+        app.config.action_dispatch.ip_spoofing_check = false
+      end
+
+      assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do
+        assert_equal "1.1.1.2", remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2")
+      end
+    end
+
+    test "the user can set trusted proxies" do
+      make_basic_app do |app|
+        app.config.action_dispatch.trusted_proxies = /^4\.2\.42\.42$/
+      end
+
+      assert_equal "1.1.1.1", remote_ip("REMOTE_ADDR" => "4.2.42.42,1.1.1.1")
+    end
+
     private
+
       def boot!
         require "#{app_path}/config/environment"
       end
@@ -91,5 +171,18 @@ module ApplicationTests
       def middleware
         AppTemplate::Application.middleware.active.map(&:klass).map(&:name)
       end
+
+      def remote_ip(env = {})
+        remote_ip = nil
+        env = Rack::MockRequest.env_for("/").merge(env).merge('action_dispatch.show_exceptions' => false)
+
+        endpoint = Proc.new do |e|
+          remote_ip = ActionDispatch::Request.new(e).remote_ip
+          [200, {}, ["Hello"]]
+        end
+
+        Rails.application.middleware.build(endpoint).call(env)
+        remote_ip
+      end
   end
 end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
new file mode 100644
index 0000000000..bf2da866f4
--- /dev/null
+++ b/railties/test/application/rake_test.rb
@@ -0,0 +1,23 @@
+require "isolation/abstract_unit"
+
+module ApplicationTests
+  class RakeTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
+
+    def setup
+      build_app
+      boot_rails
+      FileUtils.rm_rf("#{app_path}/config/environments")
+    end
+    
+    def test_gems_tasks_are_loaded_first_than_application_ones
+      app_file "lib/tasks/app.rake", <<-RUBY
+        $task_loaded = Rake::Task.task_defined?("db:create:all")
+      RUBY
+      
+      require "#{app_path}/config/environment"
+      ::Rails.application.load_tasks
+      assert $task_loaded
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index f0c64b92ba..6f4c5d77f3 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -103,6 +103,25 @@ module TestHelpers
       add_to_config 'config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"; config.session_store :cookie_store, :key => "_myapp_session"'
     end
 
+    def make_basic_app
+      require "rails"
+      require "action_controller/railtie"
+
+      app = Class.new(Rails::Application)
+      app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
+      app.config.session_store :cookie_store, :key => "_myapp_session"
+
+      yield app if block_given?
+      app.initialize!
+
+      app.routes.draw do
+        match "/" => "omg#index"
+      end
+
+      require 'rack/test'
+      extend ::Rack::Test::Methods
+    end
+
     class Bukkit
       attr_reader :path