railties 3.0.0.beta3 → 3.0.0.beta4

data/guides/source/security.textile

@@ -698,7 +698,7 @@ The most common entry points are message posts, user comments, and guest books,
 
 XSS attacks work like this: An attacker injects some code, the web application saves it and displays it on a page, later presented to a victim. Most XSS examples simply display an alert box, but it is more powerful than that. XSS can steal the cookie, hijack the session, redirect the victim to a fake website, display advertisements for the benefit of the attacker, change elements on the web site to get confidential information or install malicious software through security holes in the web browser.
 
-During the second half of 2007, there were 88 vulnerabilities reported in Mozilla browsers, 22 in Safari, 18 in IE, and 12 in Opera. The "Symantec Global Internet Security threat report":http://eval.symantec.com/mktginfo/enterprise/white_papers/b-whitepaper_internet_security_threat_report_xiii_04-2008.en-us.pdf also documented 239 browser plug-in vulnerabilities in the last six months of 2007. "Mpack":http://pandalabs.pandasecurity.com/archive/MPack-uncovered_2100_.aspx is a very active and up-to-date attack framework which exploits these vulnerabilities. For criminal hackers, it is very attractive to exploit an SQL-Injection vulnerability in a web application framework and insert malicious code in every textual table column. In April 2008 more than 510,000 sites were hacked like this, among them the British government, United Nations, and many more high targets.
+During the second half of 2007, there were 88 vulnerabilities reported in Mozilla browsers, 22 in Safari, 18 in IE, and 12 in Opera. The "Symantec Global Internet Security threat report":http://eval.symantec.com/mktginfo/enterprise/white_papers/b-whitepaper_internet_security_threat_report_xiii_04-2008.en-us.pdf also documented 239 browser plug-in vulnerabilities in the last six months of 2007. "Mpack":http://pandalabs.pandasecurity.com/mpack-uncovered/ is a very active and up-to-date attack framework which exploits these vulnerabilities. For criminal hackers, it is very attractive to exploit an SQL-Injection vulnerability in a web application framework and insert malicious code in every textual table column. In April 2008 more than 510,000 sites were hacked like this, among them the British government, United Nations, and many more high targets.
 
 A relatively new, and unusual, form of entry points are banner advertisements. In earlier 2008, malicious code appeared in banner ads on popular sites, such as MySpace and Excite, according to "Trend Micro":http://blog.trendmicro.com/myspace-excite-and-blick-serve-up-malicious-banner-ads/.
 

data/guides/source/testing.textile

@@ -12,7 +12,7 @@ endprologue.
 
 h3. Why Write Tests for your Rails Applications?
 
-* Rails makes it super easy to write your tests. It starts by producing skeleton test code in background while you are creating your models and controllers.
+* Rails makes it super easy to write your tests. It starts by producing skeleton test code in the background while you are creating your models and controllers.
 * By simply running your Rails tests you can ensure your code adheres to the desired functionality even after some major code refactoring.
 * Rails tests can also simulate browser requests and thus you can test your application's response without having to test it through your browser.
 
@@ -54,7 +54,7 @@ For good tests, you'll need to give some thought to setting up test data. In Rai
 
 h5. What are Fixtures?
 
-_Fixtures_ is a fancy word for sample data. Fixtures allow you to populate your testing database with predefined data before your tests run. Fixtures are database independent and assume one of two formats: *YAML* or *CSV*. In this guide we will use *YAML* which is the preferred format.
+_Fixtures_ is a fancy word for sample data. Fixtures allow you to populate your testing database with predefined data before your tests run. Fixtures are database independent and assume one of two formats: *YAML* or *CSV*. In this guide, we will use *YAML*, which is the preferred format.
 
 You'll find fixtures under your +test/fixtures+ directory. When you run +rails generate model+ to create a new model, fixture stubs will be automatically created and placed in this directory.
 
@@ -65,7 +65,7 @@ YAML-formatted fixtures are a very human-friendly way to describe your sample da
 Here's a sample YAML fixture file:
 
 <yaml>
-# low & behold!  I am a YAML comment!
+# lo & behold!  I am a YAML comment!
 david:
  name: David Heinemeier Hansson
  birthday: 1979-10-15
@@ -108,7 +108,7 @@ tag is considered Ruby code. When this fixture is loaded, the +size+ attribute o
 
 h5. Fixtures in Action
 
-Rails by default automatically loads all fixtures from the 'test/fixtures' folder for your unit and functional test. Loading involves three steps:
+Rails by default automatically loads all fixtures from the +test/fixtures+ folder for your unit and functional test. Loading involves three steps:
 
 * Remove any existing data from the table corresponding to the fixture
 * Load the fixture data into the table
@@ -140,20 +140,20 @@ h3. Unit Testing your Models
 
 In Rails, unit tests are what you write to test your models.
 
-For this guide we will be using Rails _scaffolding_. It will create the model, a migration, controller and views for the new resource in a single operation. It will also create a full test suite following Rails best practices. I will be using examples from this generated code and would be supplementing it with additional examples where necessary.
+For this guide we will be using Rails _scaffolding_. It will create the model, a migration, controller and views for the new resource in a single operation. It will also create a full test suite following Rails best practices. I will be using examples from this generated code and will be supplementing it with additional examples where necessary.
 
-NOTE: For more information on Rails _scaffolding_, refer to "Getting Started with Rails":getting_started.html
+NOTE: For more information on Rails <i>scaffolding</i>, refer to "Getting Started with Rails":getting_started.html
 
 When you use +rails generate scaffold+, for a resource among other things it creates a test stub in the +test/unit+ folder:
 
-<pre>
+<shell>
 $ rails generate scaffold post title:string body:text
 ...
 create  app/models/post.rb
 create  test/unit/post_test.rb
 create  test/fixtures/posts.yml
 ...
-</pre>
+</shell>
 
 The default test stub in +test/unit/post_test.rb+ looks like this:
 
@@ -174,7 +174,7 @@ A line by line examination of this file will help get you oriented to Rails test
 require 'test_helper'
 </ruby>
 
-As you know by now that +test_helper.rb+ specifies the default configuration to run our tests. This is included with all the tests, so any methods added to this file are available to all your tests.
+As you know by now, +test_helper.rb+ specifies the default configuration to run our tests. This is included with all the tests, so any methods added to this file are available to all your tests.
 
 <ruby>
 class PostTest < ActiveSupport::TestCase
@@ -204,16 +204,16 @@ assert true
 
 This line of code is called an _assertion_. An assertion is a line of code that evaluates an object (or expression) for expected results. For example, an assertion can check:
 
-* is this value = that value?
+* does this value = that value?
 * is this object nil?
 * does this line of code throw an exception?
 * is the user's password greater than 5 characters?
 
-Every test contains one or more assertions. Only when all the assertions are successful the test passes.
+Every test contains one or more assertions. Only when all the assertions are successful will the test pass.
 
 h4. Preparing your Application for Testing
 
-Before you can run your tests you need to ensure that the test database structure is current. For this you can use the following rake commands:
+Before you can run your tests, you need to ensure that the test database structure is current. For this you can use the following rake commands:
 
 <shell>
 $ rake db:migrate
@@ -221,9 +221,9 @@ $ rake db:migrate
 $ rake db:test:load
 </shell>
 
-Above +rake db:migrate+ runs any pending migrations on the _development_ environment and updates +db/schema.rb+. +rake db:test:load+ recreates the test database from the current db/schema.rb. On subsequent attempts it is a good to first run +db:test:prepare+ as it first checks for pending migrations and warns you appropriately.
+Above +rake db:migrate+ runs any pending migrations on the _development_ environment and updates +db/schema.rb+. +rake db:test:load+ recreates the test database from the current +db/schema.rb+. On subsequent attempts, it is a good idea to first run +db:test:prepare+, as it first checks for pending migrations and warns you appropriately.
 
-NOTE: +db:test:prepare+ will fail with an error if db/schema.rb doesn't exists.
+NOTE: +db:test:prepare+ will fail with an error if +db/schema.rb+ doesn't exists.
 
 h5. Rake Tasks for Preparing your Application for Testing
 
@@ -256,7 +256,7 @@ This will run all the test methods from the test case.
 
 You can also run a particular test method from the test case by using the +-n+ switch with the +test method name+.
 
-<pre>
+<shell>
 $ ruby unit/post_test.rb -n test_truth
 
 Loaded suite unit/post_test
@@ -265,7 +265,7 @@ Started
 Finished in 0.023513 seconds.
 
 1 tests, 1 assertions, 0 failures, 0 errors
-</pre>
+</shell>
 
 The +.+ (dot) above indicates a passing test. When a test fails you see an +F+; when a test throws an error you see an +E+ in its place. The last line of the output is the summary.
 
@@ -280,7 +280,7 @@ end
 
 Let us run this newly added test.
 
-<pre>
+<shell>
 $ ruby unit/post_test.rb -n test_should_not_save_post_without_title
 Loaded suite -e
 Started
@@ -292,9 +292,9 @@ test_should_not_save_post_without_title(PostTest) [/test/unit/post_test.rb:6]:
 <false> is not true.
 
 1 tests, 1 assertions, 1 failures, 0 errors
-</pre>
+</shell>
 
-In the output, +F+ denotes a failure. You can see the corresponding trace shown under +1)+ along with the name of the failing test. The next few lines contain the stack trace followed by a message which mentions the actual value and the expected value by the assertion. The default assertion messages provide just enough information to help pinpoint the error. To make the assertion failure message more readable every assertion provides an optional message parameter, as shown here:
+In the output, +F+ denotes a failure. You can see the corresponding trace shown under +1)+ along with the name of the failing test. The next few lines contain the stack trace followed by a message which mentions the actual value and the expected value by the assertion. The default assertion messages provide just enough information to help pinpoint the error. To make the assertion failure message more readable, every assertion provides an optional message parameter, as shown here:
 
 <ruby>
 test "should not save post without title" do
@@ -305,12 +305,12 @@ end
 
 Running this test shows the friendlier assertion message:
 
-<pre>
+<shell>
   1) Failure:
 test_should_not_save_post_without_title(PostTest) [/test/unit/post_test.rb:6]:
 Saved the post without a title.
 <false> is not true.
-</pre>
+</shell>
 
 Now to get this test to pass we can add a model level validation for the _title_ field.
 
@@ -322,7 +322,7 @@ end
 
 Now the test should pass. Let us verify by running the test again:
 
-<pre>
+<shell>
 $ ruby unit/post_test.rb -n test_should_not_save_post_without_title
 Loaded suite unit/post_test
 Started
@@ -330,9 +330,9 @@ Started
 Finished in 0.193608 seconds.
 
 1 tests, 1 assertions, 0 failures, 0 errors
-</pre>
+</shell>
 
-Now if you noticed we first wrote a test which fails for a desired functionality, then we wrote some code which adds the functionality and finally we ensured that our test passes. This approach to software development is referred to as _Test-Driven Development_ (TDD).
+Now, if you noticed, we first wrote a test which fails for a desired functionality, then we wrote some code which adds the functionality and finally we ensured that our test passes. This approach to software development is referred to as _Test-Driven Development_ (TDD).
 
 TIP: Many Rails developers practice _Test-Driven Development_ (TDD). This is an excellent way to build up a test suite that exercises every part of your application. TDD is beyond the scope of this guide, but one place to start is with "15 TDD steps to create a Rails application":http://andrzejonsoftware.blogspot.com/2007/05/15-tdd-steps-to-create-rails.html.
 
@@ -348,7 +348,7 @@ end
 
 Now you can see even more output in the console from running the tests:
 
-<pre>
+<shell>
 $ ruby unit/post_test.rb -n test_should_report_error
 Loaded suite -e
 Started
@@ -361,7 +361,7 @@ NameError: undefined local variable or method `some_undefined_variable' for #<Po
     /test/unit/post_test.rb:6:in `test_should_report_error'
 
 1 tests, 0 assertions, 0 failures, 1 errors
-</pre>
+</shell>
 
 Notice the 'E' in the output. It denotes a test with error.
 
@@ -369,13 +369,13 @@ NOTE: The execution of each test method stops as soon as any error or an asserti
 
 h4. What to Include in Your Unit Tests
 
-Ideally you would like to include a test for everything which could possibly break. It's a good practice to have at least one test for each of your validations and at least one test for every method in your model.
+Ideally, you would like to include a test for everything which could possibly break. It's a good practice to have at least one test for each of your validations and at least one test for every method in your model.
 
 h4. Assertions Available
 
 By now you've caught a glimpse of some of the assertions that are available. Assertions are the worker bees of testing. They are the ones that actually perform the checks to ensure that things are going as planned.
 
-There are a bunch of different types of assertions you can use. Here's the complete list of assertions that ship with +test/unit+, the testing library used by Rails. The +[msg]+ parameter is an optional string message you can specify to make your test failure messages clearer. It's not required.
+There are a bunch of different types of assertions you can use. Here's the complete list of assertions that ship with +test/unit+, the default testing library used by Rails. The +[msg]+ parameter is an optional string message you can specify to make your test failure messages clearer. It's not required.
 
 |_.Assertion                                                       |_.Purpose|
 |+assert( boolean, [msg] )+                                        |Ensures that the object/expression is true.|
@@ -446,7 +446,7 @@ test "should get index" do
 end
 </ruby>
 
-In the +test_should_get_index+ test, Rails simulates a request on the action called index, making sure the request was successful and also ensuring that it assigns a valid +posts+ instance variable.
+In the +test_should_get_index+ test, Rails simulates a request on the action called +index+, making sure the request was successful and also ensuring that it assigns a valid +posts+ instance variable.
 
 The +get+ method kicks off the web request and populates the results into the response. It accepts 4 arguments:
 
@@ -615,7 +615,7 @@ Here's what a freshly-generated integration test looks like:
 require 'test_helper'
 
 class UserFlowsTest < ActionController::IntegrationTest
-  # fixtures :your, :models
+  fixtures :all
 
   # Replace this with your real tests.
   test "the truth" do
@@ -702,24 +702,24 @@ class UserFlowsTest < ActionController::IntegrationTest
 
   private
 
-    module CustomDsl
-      def browses_site
-        get "/products/all"
-        assert_response :success
-        assert assigns(:products)
-      end
+  module CustomDsl
+    def browses_site
+      get "/products/all"
+      assert_response :success
+      assert assigns(:products)
     end
+  end
 
-    def login(user)
-      open_session do |sess|
-        sess.extend(CustomDsl)
-        u = users(user)
-        sess.https!
-        sess.post "/login", :username => u.username, :password => u.password
-        assert_equal '/welcome', path
-        sess.https!(false)
-      end
+  def login(user)
+    open_session do |sess|
+      sess.extend(CustomDsl)
+      u = users(user)
+      sess.https!
+      sess.post "/login", :username => u.username, :password => u.password
+      assert_equal '/welcome', path
+      sess.https!(false)
     end
+  end
 end
 </ruby>
 
@@ -729,12 +729,15 @@ You don't need to set up and run your tests by hand on a test-by-test basis. Rai
 
 |_.Tasks                         |_.Description|
 |+rake test+                     |Runs all unit, functional and integration tests. You can also simply run +rake+ as the _test_ target is the default.|
-|+rake test:units+               |Runs all the unit tests from +test/unit+|
+|+rake test:benchmark+           |Benchmark the performance tests|
 |+rake test:functionals+         |Runs all the functional tests from +test/functional+|
 |+rake test:integration+         |Runs all the integration tests from +test/integration+|
+|+rake test:plugins+             |Run all the plugin tests from +vendor/plugins/*/**/test+ (or specify with +PLUGIN=_name_+)|
+|+rake test:profile+             |Profile the performance tests|
 |+rake test:recent+              |Tests recent changes|
 |+rake test:uncommitted+         |Runs all the tests which are uncommitted. Only supports Subversion|
-|+rake test:plugins+             |Run all the plugin tests from +vendor/plugins/*/**/test+ (or specify with +PLUGIN=_name_+)|
+|+rake test:units+               |Runs all the unit tests from +test/unit+|
+
 
 h3. Brief Note About +Test::Unit+
 
@@ -780,7 +783,7 @@ class PostsControllerTest < ActionController::TestCase
 end
 </ruby>
 
-Above, the +setup+ method is called before each test and so +@post+ is available for each of the tests. Rails implements +setup+ and +teardown+ as ActiveSupport::Callbacks. Which essentially means you need not only use +setup+ and +teardown+ as methods in your tests. You could specify them by using:
+Above, the +setup+ method is called before each test and so +@post+ is available for each of the tests. Rails implements +setup+ and +teardown+ as +ActiveSupport::Callbacks+. Which essentially means you need not only use +setup+ and +teardown+ as methods in your tests. You could specify them by using:
 
 * a block
 * a method (like in the earlier example)
@@ -845,9 +848,9 @@ Testing mailer classes requires some specific tools to do a thorough job.
 
 h4. Keeping the Postman in Check
 
-Your +ActionMailer+ classes -- like every other part of your Rails application -- should be tested to ensure that it is working as expected.
+Your mailer classes -- like every other part of your Rails application -- should be tested to ensure that it is working as expected.
 
-The goals of testing your +ActionMailer+ classes are to ensure that:
+The goals of testing your mailer classes are to ensure that:
 
 * emails are being processed (created and sent)
 * the email content is correct (subject, sender, body, etc)
@@ -855,7 +858,7 @@ The goals of testing your +ActionMailer+ classes are to ensure that:
 
 h5. From All Sides
 
-There are two aspects of testing your mailer, the unit tests and the functional tests. In the unit tests, you run the mailer in isolation with tightly controlled inputs and compare the output to a known value (a fixture -- yay! more fixtures!). In the functional tests you don't so much test the minute details produced by the mailer Instead we test that our controllers and models are using the mailer in the right way. You test to prove that the right email was sent at the right time.
+There are two aspects of testing your mailer, the unit tests and the functional tests. In the unit tests, you run the mailer in isolation with tightly controlled inputs and compare the output to a known value (a fixture.) In the functional tests you don't so much test the minute details produced by the mailer; instead, we test that our controllers and models are using the mailer in the right way. You test to prove that the right email was sent at the right time.
 
 h4. Unit Testing
 
@@ -907,7 +910,7 @@ However often in unit tests, mails will not actually be sent, simply constructed
 
 h4. Functional Testing
 
-Functional testing for mailers involves more than just checking that the email body, recipients and so forth are correct. In functional mail tests you call the mail deliver methods and check that the appropriate emails have been appended to the delivery list. It is fairly safe to assume that the deliver methods themselves do their job You are probably more interested in is whether your own business logic is sending emails when you expect them to got out. For example, you can check that the invite friend operation is sending an email appropriately:
+Functional testing for mailers involves more than just checking that the email body, recipients and so forth are correct. In functional mail tests you call the mail deliver methods and check that the appropriate emails have been appended to the delivery list. It is fairly safe to assume that the deliver methods themselves do their job. You are probably more interested in whether your own business logic is sending emails when you expect them to go out. For example, you can check that the invite friend operation is sending an email appropriately:
 
 <ruby>
 require 'test_helper'

data/guides/w3c_validator.rb

@@ -0,0 +1,67 @@
+# ---------------------------------------------------------------------------
+#
+# This script validates the generated guides against the W3C Validator.
+#
+# Guides are taken from the output directory, from where all .html files are
+# submitted to the validator.
+#
+# This script is prepared to be launched from the railties directory as a rake task:
+#
+# rake validate_guides
+#
+# If nothing is specified, all files will be validated, but you can check just
+# some of them using this environment variable:
+#
+#   ONLY
+#     Use ONLY if you want to validate only one or a set of guides. Prefixes are
+#     enough:
+#
+#       # validates only association_basics.html
+#       ONLY=assoc rake validate_guides
+#
+#     Separate many using commas:
+#
+#       # validates only 
+#       ONLY=assoc,migrations rake validate_guides
+#
+# ---------------------------------------------------------------------------
+
+require 'rubygems'
+require 'w3c_validators'
+include W3CValidators
+
+module RailsGuides
+  class Validator
+    
+    def validate
+      validator = MarkupValidator.new
+
+      guides_to_validate.each do |f|  
+        puts "Validating #{f}"
+        results = validator.validate_file(f)
+
+        if !results.validity
+          puts "#{f} FAILED W3C validation with #{results.errors.size} error(s):"
+          results.errors.each do |error|
+            puts error.to_s
+          end
+        end
+      end
+    end
+    
+    private
+    def guides_to_validate
+      guides = Dir["./guides/output/*.html"]
+      ENV.key?('ONLY') ? select_only(guides) : guides
+    end
+
+    def select_only(guides)
+      prefixes = ENV['ONLY'].split(",").map(&:strip)
+      guides.select do |guide|
+        prefixes.any? {|p| guide.start_with?("./guides/output/#{p}")}
+      end
+    end
+  end
+end
+
+RailsGuides::Validator.new.validate

data/lib/rails.rb

@@ -23,6 +23,7 @@ if RUBY_VERSION < '1.9'
   $KCODE='u'
 else
   Encoding.default_external = Encoding::UTF_8
+  Encoding.default_internal = Encoding::UTF_8
 end
 
 module Rails

data/lib/rails/application.rb

@@ -12,7 +12,7 @@ module Rails
   # points to it.
   #
   # In other words, Rails::Application is Singleton and whenever you are accessing
-  # Rails::Application.config or YourApplication::Application.config, you are actually 
+  # Rails::Application.config or YourApplication::Application.config, you are actually
   # accessing YourApplication::Application.instance.config.
   #
   # == Initialization
@@ -27,7 +27,7 @@ module Rails
   # Besides providing the same configuration as Rails::Engine and Rails::Railtie,
   # the application object has several specific configurations, for example
   # "allow_concurrency", "cache_classes", "consider_all_requests_local", "filter_parameters",
-  # "logger", "metals", "reload_engines", "reload_plugins" and so forth.
+  # "logger", "reload_engines", "reload_plugins" and so forth.
   #
   # Check Rails::Application::Configuration to see them all.
   #
@@ -36,17 +36,15 @@ module Rails
   # The application object is also responsible for holding the routes and reloading routes
   # whenever the files change in development.
   #
-  # == Middlewares and metals
+  # == Middlewares
+  #
+  # The Application is also responsible for building the middleware stack.
   #
-  # The Application is also responsible for building the middleware stack and setting up
-  # both application and engines metals.
-  # 
   class Application < Engine
     autoload :Bootstrap,      'rails/application/bootstrap'
     autoload :Configurable,   'rails/application/configurable'
     autoload :Configuration,  'rails/application/configuration'
     autoload :Finisher,       'rails/application/finisher'
-    autoload :MetalLoader,    'rails/application/metal_loader'
     autoload :Railties,       'rails/application/railties'
     autoload :RoutesReloader, 'rails/application/routes_reloader'
 
@@ -69,6 +67,8 @@ module Rails
         raise "You cannot have more than one Rails::Application" if Rails.application
         super
         Rails.application = base.instance
+        Rails.application.add_lib_to_load_paths!
+        ActiveSupport.run_load_hooks(:before_configuration, base.instance)
       end
 
       def respond_to?(*args)
@@ -82,13 +82,23 @@ module Rails
       end
     end
 
-    delegate :metal_loader, :to => :config
+    delegate :middleware, :to => :config
+
+    def add_lib_to_load_paths!
+      path = config.root.join('lib').to_s
+      $LOAD_PATH.unshift(path) if File.exists?(path)
+    end
 
     def require_environment!
-      environment = config.paths.config.environment.to_a.first
+      environment = paths.config.environment.to_a.first
       require environment if environment
     end
 
+    def eager_load!
+      railties.all(&:eager_load!)
+      super
+    end
+
     def routes
       @routes ||= ActionDispatch::Routing::RouteSet.new
     end
@@ -112,20 +122,23 @@ 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
 
     def app
-      @app ||= middleware.build(routes)
+      @app ||= begin
+        config.middleware = config.middleware.merge_into(default_middleware_stack)
+        config.middleware.build(routes)
+      end
     end
 
     def call(env)
@@ -149,11 +162,34 @@ module Rails
 
   protected
 
+    def default_middleware_stack
+      ActionDispatch::MiddlewareStack.new.tap do |middleware|
+        middleware.use ::ActionDispatch::Static, paths.public.to_a.first if config.serve_static_assets
+        middleware.use ::Rack::Lock if !config.allow_concurrency
+        middleware.use ::Rack::Runtime
+        middleware.use ::Rails::Rack::Logger
+        middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local if config.action_dispatch.show_exceptions
+        middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
+        middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
+        middleware.use ::ActionDispatch::Callbacks, !config.cache_classes
+        middleware.use ::ActionDispatch::Cookies
+
+        if config.session_store
+          middleware.use config.session_store, config.session_options
+          middleware.use ::ActionDispatch::Flash
+        end
+
+        middleware.use ::ActionDispatch::ParamsParser
+        middleware.use ::Rack::MethodOverride
+        middleware.use ::ActionDispatch::Head
+      end
+    end
+
     def initialize_tasks
       require "rails/tasks"
       task :environment do
         $rails_rake_task = true
-        initialize!
+        require_environment!
       end
     end